From f1cd330539b8704568454aa7c82c8c503c8e47d8 Mon Sep 17 00:00:00 2001
From: Artur Shiriev <lesnik512@gmail.com>
Date: Wed, 8 Jul 2026 10:29:42 +0300
Subject: [PATCH 1/4] chore(planning): swap index.py and templates for
 convention 2.0.0

Drop the plan.md template per the 2.0.0 APPLY.md flow (change/design
templates now cover the flat single-file change format).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 planning/_templates/change.md                 |    4 +-
 planning/_templates/design.md                 |   34 +-
 planning/_templates/plan.md                   |   46 -
 ...2026-06-03.01-faststream-0.7-migration.md} |    0
 .../plan.md                                   | 1128 -----------------
 ....01-faststream-0.7.1-testbroker-typing.md} |    0
 .../plan.md                                   |  249 ----
 ....md => 2026-06-09.01-mkdocs-gh-actions.md} |    0
 .../2026-06-09.01-mkdocs-gh-actions/plan.md   |  614 ---------
 ...design.md => 2026-06-26.01-timer-store.md} |    0
 .../changes/2026-06-26.01-timer-store/plan.md |  231 ----
 ...sign.md => 2026-06-26.02-poll-schedule.md} |    0
 .../2026-06-26.02-poll-schedule/plan.md       |  120 --
 ...2026-06-29.01-python-3.11-3.12-support.md} |    0
 .../plan.md                                   |  270 ----
 planning/index.py                             |  150 +--
 16 files changed, 84 insertions(+), 2762 deletions(-)
 delete mode 100644 planning/_templates/plan.md
 rename planning/changes/{2026-06-03.01-faststream-0.7-migration/design.md => 2026-06-03.01-faststream-0.7-migration.md} (100%)
 delete mode 100644 planning/changes/2026-06-03.01-faststream-0.7-migration/plan.md
 rename planning/changes/{2026-06-04.01-faststream-0.7.1-testbroker-typing/design.md => 2026-06-04.01-faststream-0.7.1-testbroker-typing.md} (100%)
 delete mode 100644 planning/changes/2026-06-04.01-faststream-0.7.1-testbroker-typing/plan.md
 rename planning/changes/{2026-06-09.01-mkdocs-gh-actions/design.md => 2026-06-09.01-mkdocs-gh-actions.md} (100%)
 delete mode 100644 planning/changes/2026-06-09.01-mkdocs-gh-actions/plan.md
 rename planning/changes/{2026-06-26.01-timer-store/design.md => 2026-06-26.01-timer-store.md} (100%)
 delete mode 100644 planning/changes/2026-06-26.01-timer-store/plan.md
 rename planning/changes/{2026-06-26.02-poll-schedule/design.md => 2026-06-26.02-poll-schedule.md} (100%)
 delete mode 100644 planning/changes/2026-06-26.02-poll-schedule/plan.md
 rename planning/changes/{2026-06-29.01-python-3.11-3.12-support/design.md => 2026-06-29.01-python-3.11-3.12-support.md} (100%)
 delete mode 100644 planning/changes/2026-06-29.01-python-3.11-3.12-support/plan.md

diff --git a/planning/_templates/change.md b/planning/_templates/change.md
index d4c8962..5aa7e81 100644
--- a/planning/_templates/change.md
+++ b/planning/_templates/change.md
@@ -5,8 +5,8 @@ summary: One line — shown in the generated index. Written at creation; finaliz
 # Change: One-line capitalized title
 
 **Lane:** lightweight — ≲30 LOC net, ≤2 files, no new file, no public-API
-change, a single straightforward test. If it outgrows this, split into
-`design.md` + `plan.md`.
+change, a single straightforward test. If it outgrows this, rewrite it from
+the design template.
 
 ## Goal
 
diff --git a/planning/_templates/design.md b/planning/_templates/design.md
index d63e22d..17dbee1 100644
--- a/planning/_templates/design.md
+++ b/planning/_templates/design.md
@@ -4,6 +4,10 @@ summary: One line — shown in the generated index. Written at creation; finaliz
 
 # Design: One-line capitalized title
 
+<!-- The single home of this change's rationale: the PR body summarizes and
+links here, never restates. Delete any section that doesn't apply — an empty
+section is ceremony. Most designs fit well under ~700 words. -->
+
 ## Summary
 
 One paragraph. What changes, at the level a reader needs to decide if this
@@ -12,37 +16,23 @@ spec is worth reading in full.
 ## Motivation
 
 Why now. What is broken or missing. Concrete observations / numbers, not
-abstract complaints. Link to memory entries or earlier specs when relevant.
-
-## Non-goals
-
-What is deliberately out of scope and (when nontrivial) why. Each item is
-a sentence; one line each.
+abstract complaints.
 
 ## Design
 
-### 1. <First piece>
-
 What changes, in enough detail that a reader who has not seen the codebase
-can follow. Code samples / diagrams welcome.
+can follow. Sketches and interface fragments welcome; never the full
+diff-to-be. Reference rejected alternatives in `decisions/` instead of
+retelling them.
 
-### 2. <Second piece>
-
-...
-
-## Operations
-
-Out-of-repo steps (DNS, infra, external account changes). Omit if none.
-
-## Out of scope
+## Non-goals
 
-Already covered above under Non-goals if appropriate. Repeat-list of
-explicitly-excluded follow-ups belongs here when the list is long.
+What is deliberately out of scope and (when nontrivial) why. One line each.
 
 ## Testing
 
-How we know it landed correctly. New pytest? Smoke check on live URL?
-Lint pass? Be specific.
+How we know it landed correctly. Be specific: the command and the expected
+signal.
 
 ## Risk
 
diff --git a/planning/_templates/plan.md b/planning/_templates/plan.md
deleted file mode 100644
index 132d720..0000000
--- a/planning/_templates/plan.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# <slug> — implementation plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use
-> superpowers:subagent-driven-development (recommended) or
-> superpowers:executing-plans to implement this plan task-by-task. Steps
-> use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** One sentence — what shipping this plan achieves. No design
-rationale; link to the spec for that.
-
-**Spec:** [`design.md`](./design.md)
-
-**Branch:** `feat/my-change` (or `fix/`, `chore/`, etc.)
-
-**Commit strategy:** Per-task commits / single commit / squash on merge.
-Whichever fits.
-
----
-
-### Task 1: <imperative description>
-
-**Files:**
-- Modify: `path/to/file.py`
-- Create: `path/to/new.py`
-
-One sentence on what this task accomplishes. No deeper reasoning — that's
-in the spec.
-
-- [ ] **Step 1: <action>**
-
-  Run / edit / verify command. Expected output.
-
-- [ ] **Step 2: <action>**
-
-  ...
-
-- [ ] **Step 3: Commit**
-
-  ```bash
-  git add path/to/file.py
-  git commit -m "<type>: <subject>"
-  ```
-
----
-
-### Task 2: ...
diff --git a/planning/changes/2026-06-03.01-faststream-0.7-migration/design.md b/planning/changes/2026-06-03.01-faststream-0.7-migration.md
similarity index 100%
rename from planning/changes/2026-06-03.01-faststream-0.7-migration/design.md
rename to planning/changes/2026-06-03.01-faststream-0.7-migration.md
diff --git a/planning/changes/2026-06-03.01-faststream-0.7-migration/plan.md b/planning/changes/2026-06-03.01-faststream-0.7-migration/plan.md
deleted file mode 100644
index 8b618b8..0000000
--- a/planning/changes/2026-06-03.01-faststream-0.7-migration/plan.md
+++ /dev/null
@@ -1,1128 +0,0 @@
-# FastStream 0.7 migration — PR1 (defensive pin + planning scaffold) Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Tighten the FastStream pin to `>=0.6,<0.7`, adopt `--cov-fail-under=100`, and scaffold the `planning/` workflow directory mirroring `faststream-outbox`. Lands the PR2 design doc in the same commit so PR2 has a home.
-
-**Architecture:** Pure config + docs change. No runtime code touched. Single commit on `chore/pin-faststream-pre-0.7`. The coverage gate is conditional: if `just test` is not at 100% today, the gate addition gets reverted and deferred to PR2 (recorded as decision in commit body).
-
-**Tech Stack:** `pyproject.toml`, `uv`, `pytest-cov`, markdown.
-
-**Related spec:** `planning/specs/2026-06-03-faststream-0.7-migration-design.md`.
-
----
-
-## Task 1: Create the working branch
-
-**Files:** None (git operation).
-
-- [ ] **Step 1: Confirm clean tree**
-
-Run: `git status`
-Expected: `nothing to commit, working tree clean` (a fresh `planning/` dir from the brainstorming session is acceptable; we'll stage it later).
-
-- [ ] **Step 2: Create branch**
-
-Run: `git switch -c chore/pin-faststream-pre-0.7`
-Expected: `Switched to a new branch 'chore/pin-faststream-pre-0.7'`
-
-## Task 2: Establish coverage baseline (precondition for gate adoption)
-
-**Files:** None (read-only test run).
-
-The spec's R8 flags that adopting `--cov-fail-under=100` in PR1 requires the suite to already hit 100%. This task discovers the baseline.
-
-- [ ] **Step 1: Run full suite via Justfile**
-
-Run: `just test`
-Expected: All tests pass. Final coverage line at bottom of output shows total `%` covered.
-
-- [ ] **Step 2: Record baseline**
-
-Note the total coverage percentage from the report. There are three branches:
-
-- **If `100%`:** Continue to Task 3 — gate adoption is safe.
-- **If `<100%` AND missing lines are trivially testable:** Continue to Task 3 but write the backfill tests in Task 3a (insert before Task 4) before adding the gate.
-- **If `<100%` AND gaps are non-trivial:** Skip the gate adoption entirely; remove "adopt `--cov-fail-under=100`" from this PR's scope; record decision in commit body; gate moves to PR2 where the orphaned-branch removal naturally lifts coverage.
-
-## Task 3: Tighten the FastStream pin
-
-**Files:**
-- Modify: `pyproject.toml` (line 12)
-
-- [ ] **Step 1: Read current dependencies block**
-
-Run: `sed -n '9,14p' pyproject.toml`
-Expected output:
-```
-requires-python = ">=3.13,<4"
-license = "MIT"
-dependencies = [
-    "faststream~=0.6",
-    "redis>=5.0",
-]
-```
-
-- [ ] **Step 2: Edit the pin**
-
-Change `"faststream~=0.6"` to `"faststream>=0.6,<0.7"` on line 12.
-
-- [ ] **Step 3: Verify edit**
-
-Run: `grep -n "faststream" pyproject.toml | grep -v module`
-Expected: `12:    "faststream>=0.6,<0.7",`
-
-## Task 4: Adopt `--cov-fail-under=100` (conditional on Task 2)
-
-**Files:**
-- Modify: `pyproject.toml` (line 67)
-
-**Skip this task if Task 2 step 2 selected the third branch (`<100%`, non-trivial gaps).**
-
-- [ ] **Step 1: Read current pytest config**
-
-Run: `sed -n '66,70p' pyproject.toml`
-Expected output:
-```
-[tool.pytest.ini_options]
-addopts = "--cov=. --cov-report term-missing"
-asyncio_mode = "auto"
-asyncio_default_fixture_loop_scope = "function"
-```
-
-- [ ] **Step 2: Append the coverage gate to addopts**
-
-Change `addopts = "--cov=. --cov-report term-missing"` to `addopts = "--cov=. --cov-report term-missing --cov-fail-under=100"`.
-
-- [ ] **Step 3: Verify edit**
-
-Run: `grep -n "addopts" pyproject.toml`
-Expected: `addopts = "--cov=. --cov-report term-missing --cov-fail-under=100"`
-
-## Task 5: Regenerate lockfile
-
-**Files:**
-- Touched (gitignored, not committed): `uv.lock`
-
-`uv.lock` is gitignored in this repo, so the file is local-only. The regeneration confirms the resolver is happy with the tightened pin.
-
-- [ ] **Step 1: Regenerate lock**
-
-Run: `uv lock`
-Expected: `Resolved N packages in <time>` with no error. The `faststream` line in `uv.lock` should resolve to a `0.6.x` version (verify by `grep '^name = "faststream"' -A 2 uv.lock`).
-
-- [ ] **Step 2: Sync environment**
-
-Run: `uv sync --all-extras --all-groups --frozen`
-Expected: Sync succeeds against the frozen lock.
-
-## Task 6: Verify the gate (re-run suite)
-
-**Files:** None.
-
-- [ ] **Step 1: Re-run full suite under the new gate**
-
-Run: `just test`
-Expected: All tests pass; if Task 4 ran, the final line is `Required test coverage of 100% reached`. If Task 4 was skipped, this is just a re-confirmation that the pin change didn't break anything.
-
-## Task 7: Scaffold `planning/` (likely already present from spec-writing)
-
-**Files:**
-- Create (if missing): `planning/specs/.gitkeep`
-- Create (if missing): `planning/plans/.gitkeep`
-
-- [ ] **Step 1: Check current state**
-
-Run: `ls -la planning/specs planning/plans 2>&1`
-Expected: Both directories already exist with `.gitkeep` files and a design doc in `planning/specs/`. (Created at spec-writing time.)
-
-- [ ] **Step 2: Touch any missing `.gitkeep` files**
-
-If either `.gitkeep` is missing:
-Run: `touch planning/specs/.gitkeep planning/plans/.gitkeep`
-
-## Task 8: Confirm design + plan docs are on disk
-
-**Files:**
-- Verify: `planning/specs/2026-06-03-faststream-0.7-migration-design.md`
-- Verify: `planning/plans/2026-06-03-faststream-0.7-migration-pr1-plan.md` (this file)
-- Verify: `planning/plans/2026-06-03-faststream-0.7-migration-pr2-plan.md`
-
-- [ ] **Step 1: List planning files**
-
-Run: `ls planning/specs planning/plans`
-Expected output:
-```
-planning/plans:
-.gitkeep
-2026-06-03-faststream-0.7-migration-pr1-plan.md
-2026-06-03-faststream-0.7-migration-pr2-plan.md
-
-planning/specs:
-.gitkeep
-2026-06-03-faststream-0.7-migration-design.md
-```
-
-## Task 9: Add `## Workflow` section to CLAUDE.md
-
-**Files:**
-- Modify: `CLAUDE.md`
-
-- [ ] **Step 1: Read current CLAUDE.md to confirm anchor**
-
-Run: `grep -n "^## " CLAUDE.md`
-Expected output:
-```
-5:## Commands
-11:## Tests
-```
-
-- [ ] **Step 2: Insert `## Workflow` between `## Commands` and `## Tests`**
-
-After the `## Commands` block (which ends with the `just install` line on line 9) and before the `## Tests` heading on line 11, insert this block (mind the leading blank line):
-
-```markdown
-
-## Workflow
-
-Per-feature workflow: brainstorming → spec in
-`planning/specs/YYYY-MM-DD-<slug>-design.md` → writing-plans →
-plan in `planning/plans/YYYY-MM-DD-<slug>-plan.md` →
-executing-plans / subagent-driven-development →
-requesting-code-review → finishing-a-development-branch.
-
-Topic slugs are kebab-case descriptions (e.g. `faststream-0.7-migration`),
-not story IDs.
-```
-
-- [ ] **Step 3: Verify section order**
-
-Run: `grep -n "^## " CLAUDE.md`
-Expected output:
-```
-5:## Commands
-11:## Workflow
-22:## Tests
-```
-(Line numbers approximate; the important thing is `## Workflow` appears between `## Commands` and `## Tests`.)
-
-## Task 10: Verify gitignore does not eat new plan files
-
-**Files:** None (read-only check).
-
-- [ ] **Step 1: Sanity check the gitignore rule**
-
-Run: `git check-ignore -v planning/plans/2026-06-03-faststream-0.7-migration-pr1-plan.md`
-Expected: exit code `1` (no output) — the file is NOT ignored.
-
-If exit code is `0` and output names `plan.md` as the rule: the gitignore rule is matching too aggressively (would surprise me but verify). In that case, edit `.gitignore` to anchor the rule: change the bare `plan.md` line to `/plan.md` so it only matches the root.
-
-## Task 11: Run lint
-
-**Files:** None.
-
-- [ ] **Step 1: Run lint**
-
-Run: `just lint`
-Expected: All four steps (`eof-fixer`, `ruff format`, `ruff check --fix`, `ty check`) green. Note: `eof-fixer` may auto-add newlines to `.gitkeep` or CLAUDE.md — re-stage afterward.
-
-## Task 12: Stage and commit
-
-**Files:** All modified/created files this PR.
-
-- [ ] **Step 1: Stage changes**
-
-Run:
-```
-git add pyproject.toml \
-        CLAUDE.md \
-        planning/
-```
-
-- [ ] **Step 2: Confirm staged files**
-
-Run: `git status --short`
-Expected output (order may vary):
-```
-M  CLAUDE.md
-M  pyproject.toml
-A  planning/plans/.gitkeep
-A  planning/plans/2026-06-03-faststream-0.7-migration-pr1-plan.md
-A  planning/plans/2026-06-03-faststream-0.7-migration-pr2-plan.md
-A  planning/specs/.gitkeep
-A  planning/specs/2026-06-03-faststream-0.7-migration-design.md
-```
-
-If `uv.lock` shows up in `git status` despite being gitignored, do **not** stage it — confirm `.gitignore` still lists `uv.lock`.
-
-- [ ] **Step 3: Verify no per-call kwarg accidentally landed**
-
-Run: `git diff --cached pyproject.toml`
-Expected: only the two single-line edits (pin + addopts).
-
-- [ ] **Step 4: Commit**
-
-```bash
-git commit -m "$(cat <<'EOF'
-chore: pin faststream <0.7 and adopt planning/ workflow
-
-- pyproject.toml: faststream~=0.6 -> >=0.6,<0.7. Explicit upper bound
-  makes intent visible and lets the 0.7 migration land in a feature
-  branch without users pulling unfinished work.
-- pyproject.toml: addopts adds --cov-fail-under=100 (matches sister
-  faststream-outbox project). Hardens the coverage gate before the
-  0.7 migration (PR2) removes branches.
-- planning/: scaffold planning/specs/ + planning/plans/ with .gitkeep
-  files; mirrors the sister faststream-outbox layout. Includes the
-  faststream-0.7 migration design and the two plan files so PR2 has
-  a home.
-- CLAUDE.md: new ## Workflow section pointing at the planning/ layout.
-
-Companion PR migrates to faststream 0.7 and drops 0.6 support
-(>=0.7,<0.8).
-EOF
-)"
-```
-
-(If Task 4 was skipped, drop the `--cov-fail-under=100` bullet from the body.)
-
-- [ ] **Step 5: Verify commit**
-
-Run: `git log -1 --stat`
-Expected: single commit with the message above and the staged files.
-
-## Task 13: Push and open PR
-
-**Files:** None (git remote operation).
-
-- [ ] **Step 1: Push branch**
-
-Run: `git push -u origin chore/pin-faststream-pre-0.7`
-Expected: `* [new branch]` line and a hint URL for opening the PR.
-
-- [ ] **Step 2: Open PR via gh**
-
-```bash
-gh pr create --title "chore: pin faststream <0.7 and adopt planning/ workflow" --body "$(cat <<'EOF'
-## Summary
-
-- Tightens the FastStream pin from `~=0.6` to `>=0.6,<0.7`. The companion PR migrates to 0.7 and drops 0.6 support.
-- Adopts `--cov-fail-under=100` (matches sister `faststream-outbox` project).
-- Scaffolds `planning/specs/` and `planning/plans/` and lands the 0.7 migration design + two-PR plan files.
-
-## Test plan
-
-- [ ] `just lint` passes
-- [ ] `just test` passes at 100% coverage
-- [ ] `planning/specs/` and `planning/plans/` are tracked by git
-- [ ] `CLAUDE.md` shows the new `## Workflow` section between `## Commands` and `## Tests`
-EOF
-)"
-```
-
-(If Task 4 was skipped: drop the second bullet of the Summary block.)
-
-- [ ] **Step 3: Note PR URL**
-
-The `gh pr create` command outputs the PR URL. Record it for the user.
-
----
-
-## Verification (acceptance gate)
-
-The PR is done iff:
-
-- [ ] `git diff main..chore/pin-faststream-pre-0.7 -- pyproject.toml` shows only the pin edit and (if applicable) the `--cov-fail-under=100` addition.
-- [ ] `git grep -n "faststream~=0.6"` returns nothing on the branch.
-- [ ] `planning/specs/2026-06-03-faststream-0.7-migration-design.md` exists and is tracked.
-- [ ] `planning/plans/2026-06-03-faststream-0.7-migration-pr1-plan.md` (this file) exists and is tracked.
-- [ ] `planning/plans/2026-06-03-faststream-0.7-migration-pr2-plan.md` exists and is tracked.
-- [ ] `planning/specs/.gitkeep` and `planning/plans/.gitkeep` exist and are tracked.
-- [ ] `CLAUDE.md` contains the `## Workflow` section between `## Commands` and `## Tests`.
-- [ ] `just lint` clean on the branch tip.
-- [ ] `just test` green (at 100% if Task 4 ran).
-- [ ] PR is open with the prescribed title and body.
-
-
----
-
-# FastStream 0.7 migration — PR2 (migrate to 0.7, drop 0.6) Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Bump `faststream>=0.6,<0.7` → `faststream>=0.7,<0.8`. Drop 0.6 support entirely (no compat shim). Fix the mechanical 0.7 break points and drop the public per-call `middlewares=` kwarg upstream removed. Single bundled commit on `chore/faststream-0.7-migration`.
-
-**Architecture:** Surgical edits across `publisher/`, `registrator.py`, `router.py`, `testing.py`. No new features adopted (broker-level `AckPolicy` default, multi-broker, Redis Cluster, MQTT — all deferred). The producer's `codec` attribute is a structural-typing satisfier (`DefaultCodec()` shared instance); runtime ignores it because `TimerMessageFormat.encode` owns the encoding pipeline.
-
-**Tech Stack:** FastStream 0.7, ty, ruff, pytest-cov (gate at 100% from PR1, unless PR1 deferred it).
-
-**Related spec:** `planning/specs/2026-06-03-faststream-0.7-migration-design.md`.
-
-**Pre-resolved unknowns from spec (verified against upstream `main` during plan writing):**
-- `CodecProto` lives at `faststream._internal.parser.CodecProto`. Non-Optional on `ProducerProto`.
-- `DefaultCodec` concrete impl lives at `faststream._internal.parser.DefaultCodec`. Stateless — safe to share as a class-level default.
-- `AckPolicy.NACK_ON_ERROR` still exists; importable via `from faststream.middlewares import AckPolicy` (unchanged).
-- `PublisherUsecase._publish(... _extra_middlewares=)` is preserved in 0.7. No change to `publisher/usecase.py` lines 79/87/94 or `tests/test_delivery.py:106`.
-- `PublisherUsecaseConfig` in 0.7 has no `middlewares` field at all — passing `middlewares=` to `TimersPublisherConfig(...)` will TypeError.
-- `add_call` in 0.7 takes only `parser_`, `decoder_`, `dependencies_`, `codec_` (optional). No `middlewares_`.
-
----
-
-## Task 1: Create the working branch (PR1 must be merged to main first)
-
-**Files:** None (git operation).
-
-- [ ] **Step 1: Confirm PR1 has merged**
-
-Run: `git switch main && git pull`
-Expected: HEAD includes the `chore: pin faststream <0.7 and adopt planning/ workflow` commit.
-
-- [ ] **Step 2: Create branch**
-
-Run: `git switch -c chore/faststream-0.7-migration`
-Expected: `Switched to a new branch 'chore/faststream-0.7-migration'`
-
-## Task 2: Bump the pin and resolve
-
-**Files:**
-- Modify: `pyproject.toml` (line 12 — verify with grep, post-PR1 the line numbers shouldn't shift)
-- Touched (gitignored): `uv.lock`
-
-- [ ] **Step 1: Read current pin**
-
-Run: `grep -n "faststream" pyproject.toml | grep -v module`
-Expected: `12:    "faststream>=0.6,<0.7",` (if PR1 merged cleanly).
-
-- [ ] **Step 2: Bump pin**
-
-Change the `"faststream>=0.6,<0.7"` line to `"faststream>=0.7,<0.8"`.
-
-- [ ] **Step 3: Verify edit**
-
-Run: `grep -n "faststream" pyproject.toml | grep -v module`
-Expected: `12:    "faststream>=0.7,<0.8",`
-
-- [ ] **Step 4: Re-lock and sync**
-
-Run: `uv lock --upgrade && uv sync --all-extras --all-groups --frozen`
-Expected: `Resolved N packages` with `faststream` at a `0.7.x` version. Confirm via:
-Run: `grep -A 2 '^name = "faststream"$' uv.lock | head -3`
-Expected: `version = "0.7.X"` where `X` >= 0.
-
-## Task 3: First diagnostic run
-
-**Files:** None (read-only diagnostics).
-
-The remaining tasks are driven by what ty + the test suite report once the new wheel is installed. This task captures the failure surface so subsequent tasks can target it precisely.
-
-- [ ] **Step 1: Run ty to see all type errors**
-
-Run: `uv run ty check 2>&1 | tee /tmp/ty-baseline.txt | head -80`
-Expected: One or more errors. The known issues we expect (write them down — they drive Tasks 4–8):
-- `TimersProducer` missing `codec` attribute (or `FakeTimersProducer` likewise).
-- `TimersRegistrator.subscriber` calling `add_call(..., middlewares_=...)` — `middlewares_` not in signature.
-- `TestTimersBroker.create_publisher_fake_subscriber` being a `@staticmethod` vs the abstract instance-method base.
-- Possibly: moved `faststream._internal.*` imports (less likely; will surface if so).
-
-- [ ] **Step 2: Run unit + fake tests (no Redis required) to see runtime breaks**
-
-Run: `uv run pytest tests/test_unit.py tests/test_fake.py 2>&1 | tee /tmp/pytest-baseline.txt | tail -60`
-Expected: Failures likely include `TypeError: TimersPublisherConfig.__init__() got an unexpected keyword argument 'middlewares'` (from `publisher/factory.py:27`) once the test hits a publisher construction path.
-
-- [ ] **Step 3: Note any surprises**
-
-If ty surfaces an `_internal.*` import that moved, record the new path. Each is a single-line fix in Task 9.
-
-## Task 4: Add `codec` attribute to `TimersProducer` (+ inheritor gets it free)
-
-**Files:**
-- Modify: `faststream_redis_timers/publisher/producer.py`
-
-`FakeTimersProducer` inherits from `TimersProducer` but does not call `super().__init__()`, so a class-level default is the simplest way to give both classes the attribute.
-
-- [ ] **Step 1: Write the failing test (extends `tests/test_unit.py`)**
-
-Add to `tests/test_unit.py` (top-level test function):
-
-```python
-def test_timers_producer_satisfies_producer_proto_codec() -> None:
-    """0.7's ProducerProto requires a `codec: CodecProto` attribute."""
-    from faststream._internal.parser import CodecProto, DefaultCodec
-    from faststream_redis_timers.publisher.producer import TimersProducer
-
-    # Class-level default — both TimersProducer and FakeTimersProducer inherit it.
-    assert isinstance(TimersProducer.codec, DefaultCodec)
-    # And the structural check via the protocol annotation passes:
-    assert hasattr(TimersProducer, "codec")
-    # CodecProto is a Protocol; the runtime check is the annotation existing,
-    # but a positive isinstance against DefaultCodec is the load-bearing assertion.
-```
-
-- [ ] **Step 2: Run the test, confirm it fails**
-
-Run: `uv run pytest tests/test_unit.py::test_timers_producer_satisfies_producer_proto_codec -v`
-Expected: FAIL with `AttributeError: type object 'TimersProducer' has no attribute 'codec'`.
-
-- [ ] **Step 3: Edit `producer.py` to satisfy the protocol**
-
-Current `producer.py` top (lines 1-16):
-
-```python
-import typing
-
-from faststream_redis_timers.envelope import TimerMessageFormat
-from faststream_redis_timers.response import TimerPublishCommand
-
-
-if typing.TYPE_CHECKING:
-    from fast_depends.library.serializer import SerializerProto
-    from faststream._internal.types import AsyncCallable
-
-    from faststream_redis_timers.configs import ConnectionState
-
-
-class TimersProducer:
-    _parser: "AsyncCallable"
-    _decoder: "AsyncCallable"
-```
-
-Change to (note the new runtime import and the class-level codec assignment):
-
-```python
-import typing
-
-from faststream._internal.parser import DefaultCodec
-from faststream_redis_timers.envelope import TimerMessageFormat
-from faststream_redis_timers.response import TimerPublishCommand
-
-
-if typing.TYPE_CHECKING:
-    from fast_depends.library.serializer import SerializerProto
-    from faststream._internal.parser import CodecProto
-    from faststream._internal.types import AsyncCallable
-
-    from faststream_redis_timers.configs import ConnectionState
-
-
-class TimersProducer:
-    _parser: "AsyncCallable"
-    _decoder: "AsyncCallable"
-    codec: "CodecProto" = DefaultCodec()
-```
-
-Rationale: `CodecProto` is non-Optional on `ProducerProto`, so the attribute must exist. `DefaultCodec()` is stateless (verified in upstream `parser.py`), making the shared class-level default safe. `FakeTimersProducer` inherits the attribute without changes.
-
-- [ ] **Step 4: Run the test, confirm it passes**
-
-Run: `uv run pytest tests/test_unit.py::test_timers_producer_satisfies_producer_proto_codec -v`
-Expected: PASS.
-
-- [ ] **Step 5: Confirm `FakeTimersProducer` inherits**
-
-Run inline:
-```
-uv run python -c "from faststream_redis_timers.testing import FakeTimersProducer; from faststream._internal.parser import DefaultCodec; assert isinstance(FakeTimersProducer.codec, DefaultCodec); print('ok')"
-```
-Expected: `ok`.
-
-## Task 5: Fix `create_publisher_fake_subscriber` (drop @staticmethod)
-
-**Files:**
-- Modify: `faststream_redis_timers/testing.py` (lines 41–56)
-
-- [ ] **Step 1: Write the failing assertion (extends `tests/test_unit.py`)**
-
-Add to `tests/test_unit.py`:
-
-```python
-def test_create_publisher_fake_subscriber_is_instance_method() -> None:
-    """0.7's TestBroker base declares the method as an instance method."""
-    import inspect
-    from faststream_redis_timers.testing import TestTimersBroker
-
-    sig = inspect.signature(TestTimersBroker.create_publisher_fake_subscriber)
-    # First parameter must be `self` post-migration.
-    assert list(sig.parameters)[0] == "self"
-```
-
-- [ ] **Step 2: Run the test, confirm it fails**
-
-Run: `uv run pytest tests/test_unit.py::test_create_publisher_fake_subscriber_is_instance_method -v`
-Expected: FAIL with assertion mismatch (first param will be `broker`, not `self`).
-
-- [ ] **Step 3: Edit `testing.py`**
-
-Current `testing.py:41-46`:
-
-```python
-    @staticmethod
-    def create_publisher_fake_subscriber(
-        broker: TimersBroker,
-        publisher: TimersPublisher,
-    ) -> tuple[TimersSubscriber, bool]:
-```
-
-Change to:
-
-```python
-    def create_publisher_fake_subscriber(
-        self,
-        broker: TimersBroker,
-        publisher: TimersPublisher,
-    ) -> tuple[TimersSubscriber, bool]:
-```
-
-(Drop the `@staticmethod` decorator; add `self` as the first parameter. The body is unchanged.)
-
-- [ ] **Step 4: Run the test, confirm it passes**
-
-Run: `uv run pytest tests/test_unit.py::test_create_publisher_fake_subscriber_is_instance_method -v`
-Expected: PASS.
-
-## Task 6: Drop `middlewares_=` from `add_call` and `middlewares=` from `TimersRegistrator.subscriber`
-
-**Files:**
-- Modify: `faststream_redis_timers/registrator.py` (lines 7, 29, 61)
-
-- [ ] **Step 1: Find tests that pass per-call `middlewares=` to `subscriber()`**
-
-Run: `git grep -n 'subscriber(.*middlewares=' tests/ faststream_redis_timers/`
-Expected: Zero or more hits. Each is a test or call site that must change.
-
-- [ ] **Step 2: For each test hit:**
-  - If the test was only covering per-call middleware behavior: delete it. Note: the `--cov-fail-under=100` gate (if PR1 adopted it) will catch any line in `registrator.py` that becomes uncovered as a result.
-  - If the test was using middleware to assert something else (interceptor invocation, ordering): rewrite using broker-scope `BaseMiddleware` (`TimersBroker(middlewares=[...])`).
-
-- [ ] **Step 3: Edit `registrator.py`**
-
-Drop `SubscriberMiddleware` from the import on line 7 if no longer used:
-
-Current:
-```python
-from faststream._internal.types import CustomCallable, PublisherMiddleware, SubscriberMiddleware
-```
-
-Change to (drop `SubscriberMiddleware`; keep `PublisherMiddleware` for now — Task 7 handles it):
-```python
-from faststream._internal.types import CustomCallable, PublisherMiddleware
-```
-
-Also drop the now-unused `Sequence` import if no other usage remains — check after the rest of the edits.
-
-In `subscriber()` (lines 18–62):
-- Drop line 29: `middlewares: Sequence[SubscriberMiddleware[TimerMessage]] = (),`
-- Drop line 61: `middlewares_=middlewares,` from the `add_call(...)` block (the rest of the call stays).
-
-After the edit, lines 57–62 should read:
-```python
-        return subscriber.add_call(
-            parser_=parser or self._parser,
-            decoder_=decoder or self._decoder,
-            dependencies_=dependencies,
-        )
-```
-
-- [ ] **Step 4: Run unit tests**
-
-Run: `uv run pytest tests/test_unit.py -v`
-Expected: All pass (no regression). Any test that was passing `middlewares=` to `subscriber()` should have been deleted/rewritten in Step 2.
-
-## Task 7: Drop `middlewares=` from `TimersRegistrator.publisher` + plumbing
-
-**Files:**
-- Modify: `faststream_redis_timers/registrator.py` (lines 7, 69, 78)
-- Modify: `faststream_redis_timers/publisher/factory.py` (lines 2, 9, 18, 27)
-
-- [ ] **Step 1: Find tests that pass per-call `middlewares=` to `publisher()`**
-
-Run: `git grep -n 'publisher(.*middlewares=' tests/ faststream_redis_timers/`
-Expected: Zero or more hits. Same triage as Task 6.
-
-- [ ] **Step 2: For each test hit: delete (per-call-only) or rewrite (broker-scope).**
-
-- [ ] **Step 3: Edit `registrator.py` — `publisher()` method**
-
-Drop `PublisherMiddleware` from the import on line 7 (now safe; `subscriber()` no longer needs it either):
-
-Current after Task 6:
-```python
-from faststream._internal.types import CustomCallable, PublisherMiddleware
-```
-
-Change to:
-```python
-from faststream._internal.types import CustomCallable
-```
-
-Drop the `Sequence` import on line 2 if now unused. Check by running `uv run ty check` after the edit; reinstate if needed.
-
-In `publisher()` (lines 64–85):
-- Drop line 69: `middlewares: Sequence[PublisherMiddleware] = (),`
-- Drop line 78: `middlewares=middlewares,` (the line that passes through to `create_publisher`).
-
-After the edit, lines 64–85 should read:
-```python
-    @override
-    def publisher(  # ty: ignore[invalid-method-override]
-        self,
-        topic: str,
-        *,
-        schema_: Any | None = None,
-        title_: str | None = None,
-        description_: str | None = None,
-        include_in_schema: bool = True,
-    ) -> TimersPublisher:
-        publisher = create_publisher(
-            topic=topic,
-            config=self.config,  # ty: ignore[invalid-argument-type]
-            title_=title_,
-            description_=description_,
-            schema_=schema_,
-            include_in_schema=include_in_schema,
-        )
-        super().publisher(publisher)
-        return publisher
-```
-
-- [ ] **Step 4: Edit `publisher/factory.py`**
-
-Current:
-```python
-import typing
-from collections.abc import Sequence
-
-from faststream_redis_timers.publisher.config import TimersPublisherConfig, TimersPublisherSpecificationConfig
-from faststream_redis_timers.publisher.usecase import TimersPublisher, TimersPublisherSpecification
-
-
-if typing.TYPE_CHECKING:
-    from faststream._internal.types import PublisherMiddleware
-
-    from faststream_redis_timers.configs import TimersBrokerConfig
-
-
-def create_publisher(  # noqa: PLR0913
-    *,
-    topic: str,
-    config: "TimersBrokerConfig",
-    middlewares: Sequence["PublisherMiddleware"] = (),
-    title_: str | None = None,
-    description_: str | None = None,
-    schema_: typing.Any | None = None,
-    include_in_schema: bool = True,
-) -> TimersPublisher:
-    usecase_config = TimersPublisherConfig(
-        _outer_config=config,
-        topic=topic,
-        middlewares=middlewares,
-    )
-```
-
-Change to (drop the `Sequence` import, the `PublisherMiddleware` import, the `middlewares=` param, and the `middlewares=middlewares` line in the `TimersPublisherConfig(...)` call):
-
-```python
-import typing
-
-from faststream_redis_timers.publisher.config import TimersPublisherConfig, TimersPublisherSpecificationConfig
-from faststream_redis_timers.publisher.usecase import TimersPublisher, TimersPublisherSpecification
-
-
-if typing.TYPE_CHECKING:
-    from faststream_redis_timers.configs import TimersBrokerConfig
-
-
-def create_publisher(  # noqa: PLR0913
-    *,
-    topic: str,
-    config: "TimersBrokerConfig",
-    title_: str | None = None,
-    description_: str | None = None,
-    schema_: typing.Any | None = None,
-    include_in_schema: bool = True,
-) -> TimersPublisher:
-    usecase_config = TimersPublisherConfig(
-        _outer_config=config,
-        topic=topic,
-    )
-```
-
-Also reassess `# noqa: PLR0913` — the parameter count is now 7 (below the ruff default of 5? — actually `PLR0913` defaults to flag when >5; with 7 the noqa may still apply, or you may be able to drop it). After the edit, run ruff to find out:
-
-Run: `uv run ruff check faststream_redis_timers/publisher/factory.py`
-- If ruff is silent: keep the noqa (matches existing repo style for this kind of suppression).
-- If ruff complains "Unused noqa": remove the comment.
-
-- [ ] **Step 5: Run unit + fake tests**
-
-Run: `uv run pytest tests/test_unit.py tests/test_fake.py -v`
-Expected: All pass (no regression).
-
-## Task 8: Drop `middlewares=` from router classes
-
-**Files:**
-- Modify: `faststream_redis_timers/router.py` (lines 8, 21, 29, 53, 69)
-
-- [ ] **Step 1: Find tests that pass `middlewares=` to `TimersRoute` or `TimersRoutePublisher`**
-
-Run: `git grep -n 'TimersRoute\|TimersRoutePublisher\|TimersRouter' tests/`
-Expected: Some test hits. Examine each: if they pass `middlewares=` to the route classes, delete or rewrite (same triage).
-
-- [ ] **Step 2: Edit `router.py` — `TimersRoutePublisher.__init__`**
-
-Current (lines 17–34):
-```python
-    def __init__(  # noqa: PLR0913
-        self,
-        topic: str,
-        *,
-        middlewares: Sequence[PublisherMiddleware] = (),
-        schema_: Any | None = None,
-        title_: str | None = None,
-        description_: str | None = None,
-        include_in_schema: bool = True,
-    ) -> None:
-        super().__init__(
-            topic=topic,
-            middlewares=middlewares,
-            schema_=schema_,
-            title_=title_,
-            description_=description_,
-            include_in_schema=include_in_schema,
-        )
-```
-
-Change to:
-```python
-    def __init__(  # noqa: PLR0913
-        self,
-        topic: str,
-        *,
-        schema_: Any | None = None,
-        title_: str | None = None,
-        description_: str | None = None,
-        include_in_schema: bool = True,
-    ) -> None:
-        super().__init__(
-            topic=topic,
-            schema_=schema_,
-            title_=title_,
-            description_=description_,
-            include_in_schema=include_in_schema,
-        )
-```
-
-(Then reassess `# noqa: PLR0913` per the same rule as Task 7 step 4.)
-
-- [ ] **Step 3: Edit `router.py` — `TimersRoute.__init__`**
-
-Current (lines 40–73):
-```python
-    def __init__(  # noqa: PLR0913
-        self,
-        call: Callable[..., SendableMessage] | Callable[..., Awaitable[SendableMessage]],
-        topic: str,
-        *,
-        polling_interval: float = 0.05,
-        max_polling_interval: float = 5.0,
-        max_concurrent: int = 5,
-        lease_ttl: int = 30,
-        publishers: Iterable[TimersRoutePublisher] = (),
-        dependencies: Iterable[Dependant] = (),
-        parser: CustomCallable | None = None,
-        decoder: CustomCallable | None = None,
-        middlewares: Sequence[SubscriberMiddleware[TimerMessage]] = (),
-        title_: str | None = None,
-        description_: str | None = None,
-        include_in_schema: bool = True,
-    ) -> None:
-        super().__init__(
-            call=call,
-            topic=topic,
-            polling_interval=polling_interval,
-            max_polling_interval=max_polling_interval,
-            max_concurrent=max_concurrent,
-            lease_ttl=lease_ttl,
-            publishers=publishers,
-            dependencies=dependencies,
-            parser=parser,
-            decoder=decoder,
-            middlewares=middlewares,
-            title_=title_,
-            description_=description_,
-            include_in_schema=include_in_schema,
-        )
-```
-
-Drop the two `middlewares=` lines (signature param and `super().__init__()` pass-through):
-
-```python
-    def __init__(  # noqa: PLR0913
-        self,
-        call: Callable[..., SendableMessage] | Callable[..., Awaitable[SendableMessage]],
-        topic: str,
-        *,
-        polling_interval: float = 0.05,
-        max_polling_interval: float = 5.0,
-        max_concurrent: int = 5,
-        lease_ttl: int = 30,
-        publishers: Iterable[TimersRoutePublisher] = (),
-        dependencies: Iterable[Dependant] = (),
-        parser: CustomCallable | None = None,
-        decoder: CustomCallable | None = None,
-        title_: str | None = None,
-        description_: str | None = None,
-        include_in_schema: bool = True,
-    ) -> None:
-        super().__init__(
-            call=call,
-            topic=topic,
-            polling_interval=polling_interval,
-            max_polling_interval=max_polling_interval,
-            max_concurrent=max_concurrent,
-            lease_ttl=lease_ttl,
-            publishers=publishers,
-            dependencies=dependencies,
-            parser=parser,
-            decoder=decoder,
-            title_=title_,
-            description_=description_,
-            include_in_schema=include_in_schema,
-        )
-```
-
-- [ ] **Step 4: Trim unused imports on line 8**
-
-Current:
-```python
-from faststream._internal.types import BrokerMiddleware, CustomCallable, PublisherMiddleware, SubscriberMiddleware
-```
-
-After Steps 2–3, `PublisherMiddleware` and `SubscriberMiddleware` are unused. `BrokerMiddleware` is still used by `TimersRouter.__init__`. Change to:
-
-```python
-from faststream._internal.types import BrokerMiddleware, CustomCallable
-```
-
-Drop `Sequence` from line 1 if no longer used (it's still used by `BrokerMiddleware` typing in `TimersRouter.__init__` — keep it).
-
-- [ ] **Step 5: Confirm `TimersRouter.__init__` still uses `middlewares` for broker-scope**
-
-Current (lines 79–102) — DO NOT change. `middlewares: Sequence[BrokerMiddleware[TimerMessage]]` at line 85 is broker-scope (passed as `broker_middlewares=middlewares` at line 93). This is the broker-level middleware surface, which is preserved in 0.7.
-
-- [ ] **Step 6: Run unit + fake tests**
-
-Run: `uv run pytest tests/test_unit.py tests/test_fake.py -v`
-Expected: All pass.
-
-## Task 9: Run ty + ruff to catch any `_internal.*` import moves
-
-**Files:** Discovered at runtime.
-
-- [ ] **Step 1: Run ty**
-
-Run: `uv run ty check 2>&1 | head -40`
-Expected: Either clean OR a small set of "module has no attribute X" errors for moved `_internal.*` symbols.
-
-- [ ] **Step 2: For each "module has no attribute" error**:
-
-  - Locate the symbol's new home in the installed wheel: `find .venv/lib/python3.13/site-packages/faststream -name "*.py" | xargs grep -l "class <Symbol>\|^<Symbol> = \|def <Symbol>"`.
-  - Edit the failing import in `faststream_redis_timers/` to the new path.
-  - Re-run ty. Iterate until clean.
-
-- [ ] **Step 3: Run ruff**
-
-Run: `uv run ruff check --fix faststream_redis_timers/ tests/`
-Expected: Either clean OR auto-fixable issues (e.g. unused imports from the middleware kwargs being dropped). Let ruff fix what it can; review any remaining warnings.
-
-- [ ] **Step 4: Re-run ty after ruff to confirm consistency**
-
-Run: `uv run ty check 2>&1 | tail -10`
-Expected: clean.
-
-## Task 10: Verify `AckPolicy.NACK_ON_ERROR` still works as imported
-
-**Files:** None (read-only check).
-
-The spec flagged this as R3. Upstream confirms it survived; this is a fast sanity check.
-
-- [ ] **Step 1: Sanity check the import path**
-
-Run: `uv run python -c "from faststream.middlewares import AckPolicy; print(AckPolicy.NACK_ON_ERROR.value)"`
-Expected: `nack_on_error`.
-
-If this raises `ImportError` or `AttributeError`, the location moved — find the new path via `grep -rn "NACK_ON_ERROR" .venv/lib/python3.13/site-packages/faststream/` and update `faststream_redis_timers/subscriber/config.py:6`.
-
-## Task 11: Run the full test suite
-
-**Files:** None.
-
-- [ ] **Step 1: Run full suite via Justfile (Docker; brings up Redis)**
-
-Run: `just test`
-Expected: All five test files pass. If `--cov-fail-under=100` is in effect (PR1 adopted it), the report ends with `Required test coverage of 100% reached.`
-
-- [ ] **Step 2: If coverage <100%**:
-
-  - Identify uncovered lines from the `term-missing` report.
-  - For each: write a focused test, OR delete dead code that was only reachable via the removed `middlewares=` paths.
-  - Re-run: `just test`. Iterate until 100%.
-
-## Task 12: Verify no per-call `middlewares=` survives
-
-**Files:** None.
-
-- [ ] **Step 1: Grep for residual per-call kwargs**
-
-Run: `git grep -n "middlewares_=\|middlewares=" faststream_redis_timers/ tests/`
-Expected: Hits only on `broker_middlewares=` and broker-level configs. The phrase `middlewares=` is allowed only as part of `broker_middlewares=` or in a comment.
-
-If any other hit remains: revisit the affected file; the migration is incomplete.
-
-## Task 13: Verify package-public imports still work
-
-**Files:** None.
-
-- [ ] **Step 1: Smoke test the public surface**
-
-Run:
-```
-uv run python -c "from faststream_redis_timers import TimersBroker, TimersRouter, TestTimersBroker, TimerMessage; print('ok')"
-```
-Expected: `ok`.
-
-## Task 14: Spot-check docs for stale `middlewares=` examples
-
-**Files:**
-- Possibly modify: `README.md`, `docs/usage/*.md`
-
-The brainstorming-time grep returned zero hits, but a quick re-check defends against intervening commits.
-
-- [ ] **Step 1: Grep docs**
-
-Run: `git grep -n 'middlewares=' README.md docs/`
-Expected: No hits (zero output).
-
-- [ ] **Step 2: If any hit, rewrite or drop the example**
-
-If a hit appears: the snippet shows per-call `middlewares=` use. Rewrite to broker-scope (`TimersBroker(middlewares=[...])`) or drop the example.
-
-## Task 15: Final lint pass
-
-**Files:** Possibly minor cleanup.
-
-- [ ] **Step 1: Run lint**
-
-Run: `just lint`
-Expected: All four steps green. `eof-fixer` may touch files; restage if needed.
-
-## Task 16: Stage and commit
-
-**Files:** All modified.
-
-- [ ] **Step 1: Review diff**
-
-Run: `git status --short && echo '---' && git diff --stat`
-Expected: A focused set of edits across `pyproject.toml`, `faststream_redis_timers/publisher/producer.py`, `faststream_redis_timers/publisher/factory.py`, `faststream_redis_timers/testing.py`, `faststream_redis_timers/registrator.py`, `faststream_redis_timers/router.py`, possibly other `faststream_redis_timers/*` files for `_internal.*` moves, and some test files. `uv.lock` (if present) is gitignored — don't stage it.
-
-- [ ] **Step 2: Stage non-lock files**
-
-Run:
-```
-git add pyproject.toml faststream_redis_timers/ tests/
-```
-
-If docs changed in Task 14, also: `git add README.md docs/`.
-
-- [ ] **Step 3: Confirm `uv.lock` is unstaged**
-
-Run: `git status uv.lock`
-Expected: Either "ignored" or no mention. If it shows up as modified-and-staged, remove with `git restore --staged uv.lock` and verify `.gitignore` still lists `uv.lock`.
-
-- [ ] **Step 4: Commit**
-
-```bash
-git commit -m "$(cat <<'EOF'
-chore: migrate to faststream 0.7 (breaking: drop per-call middlewares=)
-
-Bump dependency from `faststream>=0.6,<0.7` to `>=0.7,<0.8`. Drops support
-for the 0.6 series entirely (single code path, no compat shim).
-
-Mechanical 0.7 fix points:
-- publisher/producer.py: TimersProducer gains `codec: CodecProto =
-  DefaultCodec()` class-level default to satisfy 0.7's ProducerProto.
-  FakeTimersProducer inherits the attribute.
-- testing.py: create_publisher_fake_subscriber drops @staticmethod and
-  gains `self` — 0.7's TestBroker base declares it as an instance method.
-- registrator.py: TimersRegistrator.subscriber drops `middlewares=` kwarg;
-  add_call(...) drops `middlewares_=` (0.7 removed it from the base).
-
-Public API break — `middlewares=` per-call kwarg removed from:
-- TimersRegistrator.subscriber / .publisher
-- TimersRoute / TimersRoutePublisher
-- internal plumbing in publisher/factory.py + publisher/config.py
-Upstream removed per-subscriber/per-publisher middleware in 0.7. We
-follow suit rather than (a) silently routing to broker scope (semantic
-break, surprising), or (b) reimplementing locally (maintenance cost for
-a v0 package). Broker-scope middleware via `TimersBroker(middlewares=[...])`
-remains the supported entry point.
-
-No 0.7 features adopted (broker-level AckPolicy default, multi-broker,
-Redis Cluster, MQTT). Each gets its own follow-up if/when we want it.
-EOF
-)"
-```
-
-- [ ] **Step 5: Verify commit**
-
-Run: `git log -1 --stat`
-Expected: single commit with the message above and the modified files.
-
-## Task 17: Push and open PR
-
-**Files:** None.
-
-- [ ] **Step 1: Push branch**
-
-Run: `git push -u origin chore/faststream-0.7-migration`
-
-- [ ] **Step 2: Open PR**
-
-```bash
-gh pr create --title "chore: migrate to faststream 0.7 (breaking: drop per-call middlewares=)" --body "$(cat <<'EOF'
-## Summary
-
-- Bumps `faststream>=0.6,<0.7` → `>=0.7,<0.8`. Drops 0.6 support entirely.
-- Fixes the mechanical 0.7 break points (`codec` attribute on `TimersProducer`, `create_publisher_fake_subscriber` instance form, `add_call` kwarg).
-- **Breaking change for downstream consumers:** the per-call `middlewares=` kwarg is removed from `TimersRegistrator.subscriber`, `TimersRegistrator.publisher`, `TimersRoute`, and `TimersRoutePublisher`. Use broker-scope `TimersBroker(middlewares=[...])` instead.
-
-No new 0.7 features are adopted in this PR (broker-level `AckPolicy` default, multi-broker, Redis Cluster, MQTT each get their own follow-up if we want them).
-
-## Test plan
-
-- [ ] `just lint` clean (ruff + ty + eof-fixer).
-- [ ] `just test` green at 100% coverage (Redis-backed integration suite included).
-- [ ] `uv run pytest tests/test_unit.py tests/test_fake.py` green standalone.
-- [ ] `git grep -n "middlewares_=\|middlewares=" faststream_redis_timers/ tests/` returns only `broker_middlewares=` entries.
-- [ ] `git grep -n "faststream~=0.6\|faststream<0.7\|faststream>=0.6,<0.7" .` returns nothing.
-- [ ] `python -c "from faststream_redis_timers import TimersBroker, TimersRouter, TestTimersBroker"` exits 0.
-EOF
-)"
-```
-
-- [ ] **Step 3: Note PR URL**
-
-Output of the previous command. Record for the user.
-
----
-
-## Verification (acceptance gate)
-
-The PR is done iff:
-
-- [ ] `git diff main..chore/faststream-0.7-migration -- pyproject.toml` shows the pin bump to `>=0.7,<0.8`.
-- [ ] `git grep -n "middlewares_=\|middlewares=" faststream_redis_timers/ tests/` returns only `broker_middlewares=` entries.
-- [ ] `git grep -n "faststream~=0.6\|faststream<0.7\|faststream>=0.6,<0.7" .` returns nothing.
-- [ ] `just lint` clean.
-- [ ] `just test` green; coverage at 100% if PR1 adopted the gate.
-- [ ] `uv run python -c "from faststream_redis_timers import TimersBroker, TimersRouter, TestTimersBroker, TimerMessage"` exits 0.
-- [ ] PR is open with the prescribed title and body.
diff --git a/planning/changes/2026-06-04.01-faststream-0.7.1-testbroker-typing/design.md b/planning/changes/2026-06-04.01-faststream-0.7.1-testbroker-typing.md
similarity index 100%
rename from planning/changes/2026-06-04.01-faststream-0.7.1-testbroker-typing/design.md
rename to planning/changes/2026-06-04.01-faststream-0.7.1-testbroker-typing.md
diff --git a/planning/changes/2026-06-04.01-faststream-0.7.1-testbroker-typing/plan.md b/planning/changes/2026-06-04.01-faststream-0.7.1-testbroker-typing/plan.md
deleted file mode 100644
index 5d66225..0000000
--- a/planning/changes/2026-06-04.01-faststream-0.7.1-testbroker-typing/plan.md
+++ /dev/null
@@ -1,249 +0,0 @@
-# FastStream 0.7.1 TestBroker typing alignment — implementation plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Drop our `TestTimersBroker.__aenter__` workaround now that FastStream 0.7.1 fixes the `Broker | list[Broker]` typing bug, and align our generics with upstream's new `TestBroker[Broker, EnterType]` shape.
-
-**Architecture:** Bump the FastStream pin to `>=0.7.1`, bind `EnterType = TimersBroker` in our subclass generic, delete the override and its assert, update the ASGI registry annotation to two type params, and add a regression test that proves the entered context yields a single `TimersBroker` (not a list/tuple).
-
-**Tech Stack:** Python 3.13, FastStream 0.7.1, `uv` for deps, `ruff` for lint, `ty` for type check, `pytest` (under docker compose for the Redis-backed suites).
-
-**Spec:** [`planning/specs/2026-06-04-faststream-0.7.1-testbroker-typing-design.md`](../specs/2026-06-04-faststream-0.7.1-testbroker-typing-design.md)
-
-**Test placement note:** The regression test is placed in `tests/test_fake.py` rather than `tests/test_unit.py` (which the spec suggested). The test enters the `TestTimersBroker` context, which is the exact pattern `test_fake.py` already exercises, and `test_unit.py` is described in `CLAUDE.md` as "pure unit tests" that don't enter test brokers. Flag for spec-update if you'd rather it live in `test_unit.py`.
-
-**Commit strategy:** Single bundled commit at the end of Task 5. Tasks 1–4 stage incrementally without committing, so that intermediate `ty check` runs reflect work-in-progress and the final commit captures one logical change (the spec calls for this).
-
----
-
-### Task 1: Bump the FastStream pin to >=0.7.1
-
-**Files:**
-- Modify: `pyproject.toml:12`
-
-- [ ] **Step 1: Edit the dependency line**
-
-In `pyproject.toml`, change:
-
-```toml
-"faststream>=0.7,<0.8",
-```
-
-to:
-
-```toml
-"faststream>=0.7.1,<0.8",
-```
-
-- [ ] **Step 2: Refresh the lockfile and sync**
-
-Run: `just install`
-
-This runs `uv lock --upgrade` followed by `uv sync --all-extras --all-groups --frozen`. Expected: `uv` resolves `faststream==0.7.1` (the only version satisfying both `>=0.7.1` and `<0.8` at time of writing). The sync should report no errors.
-
-- [ ] **Step 3: Confirm the resolved version**
-
-Run: `uv pip show faststream | grep -i version`
-Expected output: `Version: 0.7.1`
-
-- [ ] **Step 4: Sanity-run the no-Redis tests against the upgraded library**
-
-Run: `uv run pytest tests/test_unit.py tests/test_fake.py -v`
-Expected: all tests pass (the override still satisfies the typing contract under 0.7.1, since `EnterType` defaults to `Any`). If anything fails here, **stop** — the upgrade has surfaced an unrelated regression that needs investigation before refactoring.
-
-- [ ] **Step 5: Stage the change (do not commit yet)**
-
-Run: `git add pyproject.toml uv.lock`
-
-(If `uv.lock` is not tracked in this repo, drop it from the `git add`; check `git status` first.)
-
----
-
-### Task 2: Add the regression test for `__aenter__` return shape
-
-**Files:**
-- Modify: `tests/test_fake.py` (append new test at the end of the file)
-
-This test is added *before* the refactor so we can prove the contract (single `TimersBroker` returned from the context, never a list or tuple) survives the workaround removal. Under the current code (override returns `TimersBroker` directly) the test should pass on the first run.
-
-- [ ] **Step 1: Append the new test to `tests/test_fake.py`**
-
-Add this test as the last function in the file:
-
-```python
-async def test_test_broker_aenter_returns_single_timers_broker() -> None:
-    """0.7.1's EnterType binding means TestTimersBroker yields a single TimersBroker, not a list/tuple.
-
-    Guards the contract through the upstream typing refactor: even if the base
-    class signature changes again, our single-broker subclass must always hand
-    back a single broker instance.
-    """
-    broker = TimersBroker()
-    async with TestTimersBroker(broker) as tb:
-        assert isinstance(tb, TimersBroker)
-        assert not isinstance(tb, (list, tuple))
-```
-
-No new imports needed — `TestTimersBroker` and `TimersBroker` are already imported at the top of `tests/test_fake.py`.
-
-- [ ] **Step 2: Run the new test to confirm it passes against the current code**
-
-Run: `uv run pytest tests/test_fake.py::test_test_broker_aenter_returns_single_timers_broker -v`
-Expected: PASS. (The current `__aenter__` override returns the single `TimersBroker`, so the assertions hold.)
-
-- [ ] **Step 3: Stage the change**
-
-Run: `git add tests/test_fake.py`
-
----
-
-### Task 3: Refactor `TestTimersBroker` — bind `EnterType`, drop the override
-
-**Files:**
-- Modify: `faststream_redis_timers/testing.py:34-45`
-
-- [ ] **Step 1: Replace the class declaration and remove the override**
-
-In `faststream_redis_timers/testing.py`, locate the current block (lines 34–45):
-
-```python
-class TestTimersBroker(TestBroker[TimersBroker]):
-    scheduled_timers: list[ScheduledTimer]
-
-    def __init__(self, broker: TimersBroker, **kwargs: typing.Any) -> None:
-        super().__init__(broker, **kwargs)
-        self.scheduled_timers = []
-
-    async def __aenter__(self) -> TimersBroker:
-        # __init__ enforces a single broker, so upstream's multi-broker list branch is unreachable.
-        result = await super().__aenter__()
-        assert not isinstance(result, list)  # noqa: S101
-        return result
-```
-
-Replace with:
-
-```python
-class TestTimersBroker(TestBroker[TimersBroker, TimersBroker]):
-    scheduled_timers: list[ScheduledTimer]
-
-    def __init__(self, broker: TimersBroker, **kwargs: typing.Any) -> None:
-        super().__init__(broker, **kwargs)
-        self.scheduled_timers = []
-```
-
-The base `__aenter__` returns `EnterType`, which we now bind to `TimersBroker`, so the override is redundant.
-
-- [ ] **Step 2: Re-run the regression test from Task 2**
-
-Run: `uv run pytest tests/test_fake.py::test_test_broker_aenter_returns_single_timers_broker -v`
-Expected: PASS. (Now the result comes from the base class via `EnterType = TimersBroker` instead of our override.)
-
-- [ ] **Step 3: Re-run the full `test_fake.py` suite to confirm no regression in fake-broker usage**
-
-Run: `uv run pytest tests/test_fake.py -v`
-Expected: all 15 tests pass (every test uses `async with TestTimersBroker(broker)`; if `EnterType` were wired wrong, `tb.publish(...)` calls would explode).
-
-- [ ] **Step 4: Stage the change**
-
-Run: `git add faststream_redis_timers/testing.py`
-
----
-
-### Task 4: Update the ASGI registry annotation
-
-**Files:**
-- Modify: `faststream_redis_timers/__init__.py:28`
-
-- [ ] **Step 1: Update the return type annotation**
-
-In `faststream_redis_timers/__init__.py`, locate line 28:
-
-```python
-    def get_broker_registry() -> dict[type[BrokerUsecase[typing.Any, typing.Any]], type[TestBroker[typing.Any]]]:
-```
-
-Replace with:
-
-```python
-    def get_broker_registry() -> dict[type[BrokerUsecase[typing.Any, typing.Any]], type[TestBroker[typing.Any, typing.Any]]]:
-```
-
-This matches the new shape of `faststream.asgi.factories.asyncapi.try_it_out._get_broker_registry`, which 0.7.1 typed as `dict[..., type[TestBroker[Any, Any]]]`.
-
-- [ ] **Step 2: Confirm `ty` is satisfied with the new annotation**
-
-Run: `uv run ty check faststream_redis_timers/__init__.py`
-Expected: no errors (or, if `ty check` requires the whole project, run `uv run ty check` and confirm no new errors compared to a clean baseline).
-
-- [ ] **Step 3: Stage the change**
-
-Run: `git add faststream_redis_timers/__init__.py`
-
----
-
-### Task 5: Final validation and bundled commit
-
-**Files:**
-- All four changes above are now staged together.
-
-- [ ] **Step 1: Lint the staged changes**
-
-Run: `just lint`
-Expected: `eof-fixer`, `ruff format`, `ruff check --fix`, and `ty check` all pass. If `ruff format` or `ruff check --fix` modifies any staged file, re-stage with `git add <modified-files>`.
-
-- [ ] **Step 2: Run the full test suite (under docker compose, with Redis)**
-
-Run: `just test`
-Expected: every test in `tests/test_unit.py`, `tests/test_fake.py`, `tests/test_delivery.py`, `tests/test_cancel.py`, `tests/test_isolation.py`, and `tests/test_envelope.py` passes. The new regression test from Task 2 should appear in the output and pass.
-
-- [ ] **Step 3: Review staged diff one more time**
-
-Run: `git diff --staged`
-Expected: changes only in `pyproject.toml`, `uv.lock` (if tracked), `tests/test_fake.py`, `faststream_redis_timers/testing.py`, and `faststream_redis_timers/__init__.py`. No drive-by edits.
-
-- [ ] **Step 4: Commit**
-
-Run:
-
-```bash
-git commit -m "$(cat <<'EOF'
-chore: adopt faststream 0.7.1 TestBroker typing fix
-
-ag2ai/faststream#2903 makes TestBroker generic over a second EnterType
-TypeVar (default Any) and threads it through __aenter__. Bind
-EnterType = TimersBroker in our TestTimersBroker, delete the
-__aenter__ override + isinstance(list) assert that worked around the
-old Broker | list[Broker] return type, and update the ASGI registry
-annotation to the new two-param shape. Bumps the floor to >=0.7.1.
-
-Adds a regression test guarding the single-broker contract through
-future upstream changes.
-
-Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
-EOF
-)"
-```
-
-- [ ] **Step 5: Verify clean tree**
-
-Run: `git status`
-Expected: working tree clean; one new commit on the current branch.
-
----
-
-## Validation summary (post-implementation)
-
-After Task 5, the following should hold:
-
-- `pyproject.toml` requires `faststream>=0.7.1,<0.8`.
-- `TestTimersBroker` declares `TestBroker[TimersBroker, TimersBroker]` with no `__aenter__` override.
-- The ASGI registry hook in `__init__.py` is annotated `TestBroker[typing.Any, typing.Any]`.
-- `tests/test_fake.py::test_test_broker_aenter_returns_single_timers_broker` is present and passing.
-- `just lint` and `just test` both succeed.
-
-## Risks & mitigations
-
-- **Upstream AST helper depth.** Our `TestTimersBroker.__init__` adds an extra frame on top of `TestBroker.__init__`. The 0.7.1 PR adds a `while … name == "__init__"` walk in `_internal/testing/ast.py` exactly for this, so the `with` AST analysis still finds the user frame. Validated by Task 3 Step 3 (the full `test_fake.py` suite, which depends on this mechanism). No code change required on our side.
-- **`uv lock --upgrade` pulling in unrelated upgrades.** `just install` runs `uv lock --upgrade` which refreshes *all* dependencies. If this surfaces incidental breakage, narrow the upgrade in Task 1 Step 2 to `uv lock --upgrade-package faststream` and re-run `uv sync --frozen` to avoid pulling in unrelated changes.
-- **`just test` requires Docker.** If Docker isn't running locally, `just test` will fail at the compose step. Either start Docker before Task 5 Step 2, or run `uv run pytest tests/test_unit.py tests/test_fake.py -v` as a partial substitute (this skips the Redis-backed suites — note this in the PR description if you couldn't run the full suite).
diff --git a/planning/changes/2026-06-09.01-mkdocs-gh-actions/design.md b/planning/changes/2026-06-09.01-mkdocs-gh-actions.md
similarity index 100%
rename from planning/changes/2026-06-09.01-mkdocs-gh-actions/design.md
rename to planning/changes/2026-06-09.01-mkdocs-gh-actions.md
diff --git a/planning/changes/2026-06-09.01-mkdocs-gh-actions/plan.md b/planning/changes/2026-06-09.01-mkdocs-gh-actions/plan.md
deleted file mode 100644
index 68c6517..0000000
--- a/planning/changes/2026-06-09.01-mkdocs-gh-actions/plan.md
+++ /dev/null
@@ -1,614 +0,0 @@
-# mkdocs → GitHub Actions migration + action bumps — Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Migrate documentation hosting from Read the Docs to GitHub Pages via a new `docs.yml` workflow, extract `ci.yml` into a reusable `_checks.yml` (mirroring `modern-di`), and bump pinned action versions across all workflows.
-
-**Architecture:** Workflow files are the only mutable surface. `_checks.yml` becomes a `workflow_call`-only reusable workflow containing the lint and pytest jobs; `ci.yml` shrinks to a thin caller; a new `docs.yml` runs `just docs-deploy` on doc-related pushes to `main`. A `docs-deploy` recipe is added to the Justfile so the deploy command is reproducible locally. `.readthedocs.yaml` is deleted.
-
-**Tech Stack:** GitHub Actions (reusable workflows via `workflow_call`), `just` task runner, `uv` package manager, `mkdocs` + `mkdocs gh-deploy` for GitHub Pages publishing, Redis 8 service container for integration tests.
-
----
-
-## Spec reference
-
-Design: `planning/specs/2026-06-09-mkdocs-gh-actions-design.md`
-
-## File map
-
-**Created:**
-- `.github/workflows/_checks.yml` — reusable workflow with `lint` + `pytest` jobs
-- `.github/workflows/docs.yml` — GitHub Pages deploy on doc changes
-
-**Modified:**
-- `.github/workflows/ci.yml` — thin caller of `_checks.yml`
-- `.github/workflows/publish.yml` — action versions bumped
-- `Justfile` — appended `docs-deploy` recipe
-
-**Deleted:**
-- `.readthedocs.yaml`
-
-**Untouched but worth knowing:**
-- `docs/requirements.txt` — still consumed by `mkdocs gh-deploy` via `uvx --with-requirements`
-- `mkdocs.yml` — no content/theme changes
-
----
-
-## Task ordering rationale
-
-Ordered so each commit leaves `main` green:
-
-1. Justfile recipe first — independently testable, no CI surface change.
-2. `_checks.yml` next — exists but is dormant (`workflow_call` only) until ci.yml calls it.
-3. `ci.yml` refactor — now `_checks.yml` is callable.
-4. `docs.yml` — independent of CI; isolated change.
-5. `publish.yml` bumps — independent, last because least risky.
-6. Delete `.readthedocs.yaml` — final cleanup, no behavior dependency.
-7. Verification on a feature branch.
-
----
-
-## Task 1: Add `docs-deploy` recipe to Justfile
-
-**Files:**
-- Modify: `Justfile` (append at end)
-
-- [ ] **Step 1: Read the current Justfile**
-
-Run: `cat Justfile`
-Expected: shows recipes `default`, `down`, `sh`, `test`, `build`, `install`, `lint`, `lint-ci`, `publish`. No `docs-deploy` recipe exists yet.
-
-- [ ] **Step 2: Append the `docs-deploy` recipe**
-
-Append the following block at the end of `Justfile` (preserve the existing trailing newline behavior — `eof-fixer` enforces a single trailing newline):
-
-```just
-
-# Force-pushes built site to gh-pages; CI runs this on push to main.
-# Manual invocation from a stale checkout will roll the live site back.
-docs-deploy:
-    uvx --with-requirements docs/requirements.txt mkdocs gh-deploy --force
-```
-
-Note: indentation under the recipe MUST be a tab (just convention), matching the existing recipes in this file.
-
-- [ ] **Step 3: Verify Justfile parses**
-
-Run: `just --list`
-Expected: output includes the line `docs-deploy` among the available recipes; no parse error.
-
-- [ ] **Step 4: Dry-check the recipe is well-formed**
-
-Run: `just --show docs-deploy`
-Expected: prints
-```
-docs-deploy:
-    uvx --with-requirements docs/requirements.txt mkdocs gh-deploy --force
-```
-
-Do NOT actually run `just docs-deploy` — it would force-push the docs.
-
-- [ ] **Step 5: Lint and format**
-
-Run: `just lint`
-Expected: no errors. `eof-fixer` may rewrite the trailing newline; that's fine.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add Justfile
-git commit -m "$(cat <<'EOF'
-chore(justfile): add docs-deploy recipe for mkdocs gh-deploy
-
-Mirrors modern-di. Used by the upcoming docs.yml workflow and lets
-maintainers reproduce the deploy locally if needed.
-EOF
-)"
-```
-
----
-
-## Task 2: Create reusable `_checks.yml` workflow
-
-**Files:**
-- Create: `.github/workflows/_checks.yml`
-
-- [ ] **Step 1: Confirm current CI structure**
-
-Run: `cat .github/workflows/ci.yml`
-Expected: shows the existing `lint` and `pytest` jobs with action versions `checkout@v4`, `setup-just@v2`, `setup-uv@v3`, Redis service block on the `pytest` job, Python matrix `3.13` and `3.14`, env vars `PYTHONDONTWRITEBYTECODE: 1`, `PYTHONUNBUFFERED: 1`, `REDIS_URL: redis://127.0.0.1:6379/0`.
-
-- [ ] **Step 2: Create `_checks.yml`**
-
-Create `.github/workflows/_checks.yml` with exactly this content:
-
-```yaml
-name: checks
-on:
-  workflow_call: {}
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: extractions/setup-just@v4
-      - uses: astral-sh/setup-uv@v8.2.0
-        with:
-          enable-cache: true
-          cache-dependency-glob: "**/pyproject.toml"
-      - run: uv python install 3.13
-      - run: just install lint-ci
-
-  pytest:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.13"
-          - "3.14"
-    services:
-      redis:
-        image: redis:8
-        ports:
-          - 6379:6379
-        # Set health checks to wait until redis has started
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    steps:
-      - uses: actions/checkout@v6
-      - uses: astral-sh/setup-uv@v8.2.0
-        with:
-          enable-cache: true
-          cache-dependency-glob: "**/pyproject.toml"
-      - run: uv python install ${{ matrix.python-version }}
-      - run: |
-          uv sync --all-extras --no-install-project
-          uv run --no-sync pytest . --cov=. --cov-report xml
-        env:
-          PYTHONDONTWRITEBYTECODE: 1
-          PYTHONUNBUFFERED: 1
-          REDIS_URL: redis://127.0.0.1:6379/0
-```
-
-Key points:
-- `on: workflow_call: {}` makes this callable from `ci.yml` and nothing else (no push/pr triggers — it would otherwise duplicate runs).
-- Pytest job retains the Redis service block, env vars, and inline `uv sync` / `uv run pytest` invocation from the original `ci.yml`. We do **not** switch to `just install` / `just test` because `just test` runs `docker compose`, incompatible with the GitHub Actions service-container model.
-- Lint job pins Python 3.13.
-
-- [ ] **Step 3: Verify YAML parses**
-
-Run: `python3 -c "import yaml,sys; yaml.safe_load(open('.github/workflows/_checks.yml')); print('ok')"`
-Expected: prints `ok`. (PyYAML ships with macOS system Python; if missing, use `uv run python -c "import yaml; yaml.safe_load(open('.github/workflows/_checks.yml'))"`.)
-
-- [ ] **Step 4: (Optional) actionlint check**
-
-If `actionlint` is installed (`brew install actionlint`), run:
-
-```
-actionlint .github/workflows/_checks.yml
-```
-
-Expected: no output (clean). If not installed, skip — CI will validate on push.
-
-- [ ] **Step 5: Lint**
-
-Run: `just lint`
-Expected: no errors. `eof-fixer` ensures trailing newline.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add .github/workflows/_checks.yml
-git commit -m "$(cat <<'EOF'
-ci: add reusable _checks.yml with bumped action versions
-
-Mirrors modern-di's reusable workflow layout. Keeps the redis service
-block and inline pytest command (just test runs docker compose, which
-is incompatible with GH Actions service containers).
-
-Bumps: checkout v4->v6, setup-just v2->v4, setup-uv v3->v8.2.0.
-EOF
-)"
-```
-
----
-
-## Task 3: Refactor `ci.yml` to call `_checks.yml`
-
-**Files:**
-- Modify: `.github/workflows/ci.yml` (full rewrite)
-
-- [ ] **Step 1: Replace the contents of `ci.yml`**
-
-Overwrite `.github/workflows/ci.yml` with exactly:
-
-```yaml
-name: main
-
-on:
-  push:
-    branches:
-      - main
-  pull_request: {}
-
-concurrency:
-  group: ${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  checks:
-    uses: ./.github/workflows/_checks.yml
-```
-
-Triggers and `concurrency` block are byte-for-byte preserved from the original; only the `jobs` block changes.
-
-- [ ] **Step 2: Verify YAML parses**
-
-Run: `python3 -c "import yaml; yaml.safe_load(open('.github/workflows/ci.yml')); print('ok')"`
-Expected: prints `ok`.
-
-- [ ] **Step 3: Verify reusable-workflow reference path**
-
-Run: `test -f .github/workflows/_checks.yml && echo present`
-Expected: prints `present`.
-
-- [ ] **Step 4: (Optional) actionlint**
-
-Run: `actionlint .github/workflows/ci.yml .github/workflows/_checks.yml` (if installed)
-Expected: no output.
-
-- [ ] **Step 5: Lint**
-
-Run: `just lint`
-Expected: no errors.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add .github/workflows/ci.yml
-git commit -m "$(cat <<'EOF'
-ci: collapse ci.yml to a caller of _checks.yml
-
-Triggers and concurrency unchanged. All jobs now live in the reusable
-workflow, matching modern-di's layout.
-EOF
-)"
-```
-
----
-
-## Task 4: Create `docs.yml` workflow
-
-**Files:**
-- Create: `.github/workflows/docs.yml`
-
-- [ ] **Step 1: Create `docs.yml`**
-
-Create `.github/workflows/docs.yml` with exactly this content:
-
-```yaml
-name: Deploy Docs
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - "docs/**"
-      - "mkdocs.yml"
-      - ".github/workflows/docs.yml"
-  workflow_dispatch:
-
-concurrency:
-  group: docs-deploy
-  cancel-in-progress: true
-
-permissions:
-  contents: write
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-      - uses: extractions/setup-just@v4
-      - uses: astral-sh/setup-uv@v8.2.0
-      - run: just docs-deploy
-```
-
-Key points:
-- `fetch-depth: 0` is required by `mkdocs gh-deploy` so it can read/commit on `gh-pages`.
-- `permissions: contents: write` is required to push to `gh-pages`.
-- `paths` filter limits triggers to actual doc changes; `workflow_dispatch` allows manual runs.
-- The deploy command is `just docs-deploy` (defined in Task 1).
-
-- [ ] **Step 2: Verify YAML parses**
-
-Run: `python3 -c "import yaml; yaml.safe_load(open('.github/workflows/docs.yml')); print('ok')"`
-Expected: prints `ok`.
-
-- [ ] **Step 3: (Optional) actionlint**
-
-Run: `actionlint .github/workflows/docs.yml` (if installed)
-Expected: no output.
-
-- [ ] **Step 4: Lint**
-
-Run: `just lint`
-Expected: no errors.
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add .github/workflows/docs.yml
-git commit -m "$(cat <<'EOF'
-ci: add docs.yml workflow to deploy mkdocs to GitHub Pages
-
-Triggers on push to main when docs/, mkdocs.yml, or this workflow
-changes. Force-pushes the built site to gh-pages via the new
-just docs-deploy recipe. Replaces Read the Docs as the docs host.
-
-GitHub Pages source must be set to gh-pages / (root) in repo settings
-after the first successful run.
-EOF
-)"
-```
-
----
-
-## Task 5: Bump action versions in `publish.yml`
-
-**Files:**
-- Modify: `.github/workflows/publish.yml`
-
-- [ ] **Step 1: Read current `publish.yml`**
-
-Run: `cat .github/workflows/publish.yml`
-Expected: a single job using `actions/checkout@v4`, `extractions/setup-just@v2`, `astral-sh/setup-uv@v3`, running `just publish` with `PYPI_TOKEN`.
-
-- [ ] **Step 2: Replace the contents of `publish.yml`**
-
-Overwrite `.github/workflows/publish.yml` with exactly:
-
-```yaml
-name: Publish Package
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: extractions/setup-just@v4
-      - uses: astral-sh/setup-uv@v8.2.0
-      - run: just publish
-        env:
-          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
-```
-
-Only changes: three action version bumps. Behavior, triggers, and env unchanged.
-
-- [ ] **Step 3: Verify YAML parses**
-
-Run: `python3 -c "import yaml; yaml.safe_load(open('.github/workflows/publish.yml')); print('ok')"`
-Expected: prints `ok`.
-
-- [ ] **Step 4: (Optional) actionlint**
-
-Run: `actionlint .github/workflows/publish.yml` (if installed)
-Expected: no output.
-
-- [ ] **Step 5: Lint**
-
-Run: `just lint`
-Expected: no errors.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add .github/workflows/publish.yml
-git commit -m "$(cat <<'EOF'
-ci: bump publish.yml action versions
-
-checkout v4->v6, setup-just v2->v4, setup-uv v3->v8.2.0. No behavior
-change.
-EOF
-)"
-```
-
----
-
-## Task 6: Delete `.readthedocs.yaml`
-
-**Files:**
-- Delete: `.readthedocs.yaml`
-
-- [ ] **Step 1: Confirm the file exists**
-
-Run: `cat .readthedocs.yaml`
-Expected: shows the existing 14-line config (Python 3.10, requirements at `docs/requirements.txt`, mkdocs config at `mkdocs.yml`).
-
-- [ ] **Step 2: Delete the file**
-
-Run: `git rm .readthedocs.yaml`
-Expected: prints `rm '.readthedocs.yaml'`.
-
-- [ ] **Step 3: Confirm `docs/requirements.txt` is still present**
-
-Run: `cat docs/requirements.txt`
-Expected: prints the mkdocs requirements (still used by `mkdocs gh-deploy` via `uvx --with-requirements` in `Justfile`).
-
-- [ ] **Step 4: Lint**
-
-Run: `just lint`
-Expected: no errors.
-
-- [ ] **Step 5: Commit**
-
-```bash
-git commit -m "$(cat <<'EOF'
-chore: remove .readthedocs.yaml (docs now deploy from GH Actions)
-
-Read the Docs is no longer the docs host. docs/requirements.txt
-remains and is consumed by mkdocs gh-deploy via uvx --with-requirements.
-
-After this PR merges and the first docs.yml run creates the gh-pages
-branch, set repo Settings -> Pages -> Source: gh-pages / (root).
-EOF
-)"
-```
-
----
-
-## Task 7: End-to-end verification on a feature branch
-
-This task does not write code — it confirms the previous six tasks behave correctly on GitHub before merging.
-
-- [ ] **Step 1: Push the branch**
-
-Assuming you've been working on a feature branch (e.g. `chore/mkdocs-gh-actions`):
-
-```bash
-git push -u origin chore/mkdocs-gh-actions
-```
-
-If you have been committing on `main` locally, first move the commits to a branch:
-
-```bash
-git branch chore/mkdocs-gh-actions
-git reset --hard origin/main
-git checkout chore/mkdocs-gh-actions
-git push -u origin chore/mkdocs-gh-actions
-```
-
-- [ ] **Step 2: Open a draft PR**
-
-```bash
-gh pr create --draft --title "ci: migrate docs to GH Actions + bump action versions" --body "$(cat <<'EOF'
-## Summary
-- Migrate docs hosting from Read the Docs to GitHub Pages via new `docs.yml`
-- Extract `ci.yml` jobs into reusable `_checks.yml` (mirrors modern-di)
-- Bump action versions: `checkout@v4`->`@v6`, `setup-just@v2`->`@v4`, `setup-uv@v3`->`@v8.2.0`
-- Add `just docs-deploy` recipe
-- Delete `.readthedocs.yaml`
-
-Spec: planning/specs/2026-06-09-mkdocs-gh-actions-design.md
-Plan: planning/plans/2026-06-09-mkdocs-gh-actions-plan.md
-
-## Test plan
-- [ ] CI (`_checks.yml` via `ci.yml`) passes: lint + pytest matrix
-- [ ] After merge, `docs.yml` triggers (PR touches `.github/workflows/docs.yml`)
-- [ ] `gh-pages` branch is created on first successful `docs.yml` run
-- [ ] Manual `workflow_dispatch` of `docs.yml` works
-- [ ] Configure Pages: Settings -> Pages -> Source: `gh-pages` / `(root)`
-- [ ] Published site renders at the GitHub Pages URL
-
-🤖 Generated with [Claude Code](https://claude.com/claude-code)
-EOF
-)"
-```
-
-- [ ] **Step 3: Watch the CI run**
-
-```bash
-gh pr checks --watch
-```
-
-Expected:
-- The `main / checks / lint` and `main / checks / pytest (3.13)` and `main / checks / pytest (3.14)` jobs all pass.
-- `docs.yml` does NOT run on the PR (it triggers on `push` to `main`, not `pull_request`). This is expected.
-
-- [ ] **Step 4: Inspect the workflow run via the UI or `gh`**
-
-```bash
-gh run list --workflow ci.yml --limit 3
-gh run list --workflow docs.yml --limit 3
-```
-
-Expected: CI runs visible; no `docs.yml` runs yet.
-
-- [ ] **Step 5: Merge the PR**
-
-```bash
-gh pr ready
-gh pr merge --squash --delete-branch
-```
-
-(Or use the GitHub UI.)
-
-- [ ] **Step 6: Confirm `docs.yml` triggers on the merge commit**
-
-```bash
-gh run list --workflow docs.yml --limit 3 --branch main
-gh run watch
-```
-
-Expected: a `Deploy Docs` run starts because the merge commit modifies `.github/workflows/docs.yml`. It checks out, sets up `just` + `uv`, runs `just docs-deploy`, which builds the site and force-pushes to `gh-pages`.
-
-- [ ] **Step 7: Confirm `gh-pages` branch exists**
-
-```bash
-git fetch origin
-git branch -r | grep gh-pages
-```
-
-Expected: prints `origin/gh-pages`.
-
-- [ ] **Step 8: Enable GitHub Pages**
-
-In a browser, go to repo Settings → Pages:
-- Source: **Deploy from a branch**
-- Branch: `gh-pages` / `(root)`
-- Save.
-
-Wait ~1 minute for the first Pages build, then visit the URL shown on the settings page.
-
-Expected: the rendered mkdocs site loads.
-
-- [ ] **Step 9: Verify manual dispatch works**
-
-```bash
-gh workflow run docs.yml
-gh run watch
-```
-
-Expected: a manually-triggered `Deploy Docs` run completes successfully.
-
-- [ ] **Step 10: (Optional) Update README / decommission RTD**
-
-Not part of this plan. If you have RTD badges or links in `README.md` pointing at `readthedocs.io`, update them to the GitHub Pages URL in a follow-up PR. Delete the Read the Docs project from the RTD dashboard when convenient.
-
----
-
-## Rollback
-
-If anything goes wrong after merge:
-
-- **CI broken (`_checks.yml` reference fails):** Revert the merge commit. `ci.yml` reverts to its monolithic form.
-- **Docs deploy fails:** The `gh-pages` branch is independent of `main`; nothing else is at risk. Fix forward — usually a Justfile recipe issue or a missing `docs/requirements.txt` dep.
-- **Read the Docs builds still running:** Delete the project from the RTD dashboard. No code change needed.
-
----
-
-## Self-review notes
-
-- **Spec coverage:** Every "Changes" item in the spec maps to a task:
-  - `_checks.yml` → Task 2
-  - `docs.yml` → Task 4
-  - `ci.yml` refactor → Task 3
-  - `publish.yml` bumps → Task 5
-  - `Justfile` recipe → Task 1
-  - `.readthedocs.yaml` deletion → Task 6
-  - Operational follow-up (Pages enable) → Task 7 Step 8
-- **Type consistency:** Action versions (`checkout@v6`, `setup-just@v4`, `setup-uv@v8.2.0`) match across all four workflow files. `just docs-deploy` is defined in Task 1 and called by Task 4.
-- **No placeholders:** All YAML blocks are complete and copy-pasteable; all commands have expected output.
diff --git a/planning/changes/2026-06-26.01-timer-store/design.md b/planning/changes/2026-06-26.01-timer-store.md
similarity index 100%
rename from planning/changes/2026-06-26.01-timer-store/design.md
rename to planning/changes/2026-06-26.01-timer-store.md
diff --git a/planning/changes/2026-06-26.01-timer-store/plan.md b/planning/changes/2026-06-26.01-timer-store/plan.md
deleted file mode 100644
index f30a6b8..0000000
--- a/planning/changes/2026-06-26.01-timer-store/plan.md
+++ /dev/null
@@ -1,231 +0,0 @@
-# Timer store — implementation plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use
-> superpowers:subagent-driven-development (recommended) or
-> superpowers:executing-plans to implement this plan task-by-task. Steps use
-> checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Extract a deep `TimerStore` that owns the Redis timer protocol behind
-one interface, rewiring the producer, subscriber, message, and broker to it and
-deleting `subscriber/lua.py` plus the duplicated key derivation — without
-changing observable behavior (except the cancel-path pipeline→Lua upgrade).
-
-**Architecture:** One concrete broker-wide `TimerStore` in
-`faststream_redis_timers/store.py` (seven methods; `full_topic` and clock passed
-in; payloads opaque `bytes`; ids out as `str`; lease math and Lua internal).
-Constructed once on `TimersBrokerConfig`, reached by every caller. See the spec
-([`design.md`](./design.md)) for the nine decisions.
-
-**Tech Stack:** Python 3.13, FastStream 0.7.x, `redis.asyncio`, `uv`, `ruff`,
-`ty`, `pytest` (Redis-backed suites under docker compose).
-
-**Spec:** [`design.md`](./design.md)
-
-**Branch:** `feat/timer-store`
-
-**Commit strategy:** Per-task commits. The rewire is behavior-preserving, so the
-existing integration suites (`test_delivery`/`test_cancel`/`test_isolation`/
-`test_at_least_once`) are the regression net at every step — keep them green
-task-by-task, never edit them to match new code.
-
----
-
-### Task 1: Create `store.py` with `TimerStore` (absorb the Lua)
-
-**Files:**
-- Create: `faststream_redis_timers/store.py`
-- Reference (not yet deleted): `faststream_redis_timers/subscriber/lua.py`
-
-Stand up the deep module with all seven methods and the private Lua/`eval_cached`
-moved in. Nothing wired to it yet.
-
-- [ ] **Step 1 (RED): Unit-test the pure surface**
-
-  In `tests/test_unit.py`, add tests for the parts that need no Redis: key
-  derivation (`{timeline_key}:{full_topic}` / `{payloads_key}:{full_topic}`) and
-  bytes→str normalization of ids. Assert against a `TimerStore` built with a
-  dummy `ConnectionState`. Run — expect failure (module absent).
-
-- [ ] **Step 2 (GREEN): Write `TimerStore`**
-
-  Implement the seven methods from the spec. Move `CLAIM_LUA`, `COMMIT_LUA`,
-  their SHAs, and `eval_cached` in as module-private (`_CLAIM_LUA`, `_eval_cached`,
-  …). `claim` computes `claim_score = now + lease_ttl`. `due`/`pending` return
-  `list[str]`, normalizing bytes and self-healing non-UTF-8 members via an
-  internal `remove`. `remove` uses `COMMIT_LUA`. Keep `NEVER_DECODE` internal.
-
-- [ ] **Step 3: Run the new unit tests**
-
-  `uv run pytest tests/test_unit.py -v` → pass.
-
-- [ ] **Step 4: Commit**
-
-  ```bash
-  git add faststream_redis_timers/store.py tests/test_unit.py
-  git commit -m "feat: add TimerStore owning the Redis timer protocol"
-  ```
-
----
-
-### Task 2: Construct the store; rewire the producer
-
-**Files:**
-- Modify: `faststream_redis_timers/configs.py`, `faststream_redis_timers/broker.py`,
-  `faststream_redis_timers/publisher/producer.py`,
-  `faststream_redis_timers/publisher/factory.py` (if it threads keys)
-
-- [ ] **Step 1: Hold the store on `TimersBrokerConfig`**
-
-  Add a `store: TimerStore` field; remove the now-unused raw key fields once
-  Task 5 lands (keep them this task if the subscriber/broker still read them).
-  Build one `TimerStore(connection, timeline_key, payloads_key)` in
-  `broker.py.__init__` beside the producer.
-
-- [ ] **Step 2: Shrink the producer to the envelope adapter**
-
-  `publish` = encode → `store.schedule(full_topic, timer_id, payload, activation_ts)`;
-  `cancel` = `store.remove(full_topic, timer_id)`. Constructor takes `store` +
-  `serializer`, not `connection`/keys.
-
-- [ ] **Step 3: Lean on the integration net**
-
-  `just test` (or at minimum `test_delivery` + `test_cancel`) → green.
-
-- [ ] **Step 4: Commit** (`feat: route the producer through TimerStore`)
-
----
-
-### Task 3: Rewire the subscriber poll/claim loop
-
-**Files:**
-- Modify: `faststream_redis_timers/subscriber/usecase.py`
-
-- [ ] **Step 1: Replace `_get_msgs` Redis calls**
-
-  `due = await store.due(full_topic, now, free)` → `list[str]`. Delete the
-  `isinstance(bytes)` decode, the `UnicodeDecodeError` branch, and the orphan
-  `ZREM`+`HDEL` (the store self-heals now). `_claim_and_consume` calls
-  `store.claim(full_topic, timer_id, now, lease_ttl)`; drop the inline
-  `claim_score`/`eval_cached`/`CLAIM_LUA` import.
-
-- [ ] **Step 2: Integration net**
-
-  `just test` → green (delivery + at-least-once exercise this path).
-
-- [ ] **Step 3: Commit** (`refactor: drive the subscriber loop through TimerStore`)
-
----
-
-### Task 4: Rewire the delivered message + parser
-
-**Files:**
-- Modify: `faststream_redis_timers/message.py`, `faststream_redis_timers/parser/parser.py`
-
-- [ ] **Step 1: Bound-thunk removal**
-
-  `TimerStreamMessage` drops `client`/`timeline_key`/`payloads_key`/`timer_id`
-  for `_remove: Callable[[], Awaitable[None]] | None`; `_commit` becomes
-  `if self._remove is None: return` else `await self._remove()`. Drop the
-  `subscriber/lua` import.
-
-- [ ] **Step 2: Parser builds the thunk**
-
-  `TimerParser` constructs `TimerStreamMessage(_remove=partial(store.remove,
-  full_topic, timer_id), ...)`, reaching the store via the subscriber config.
-
-- [ ] **Step 3: Integration net** — `just test` (cancel/at-least-once cover
-  ack/reject/nack) → green.
-
-- [ ] **Step 4: Commit** (`refactor: message removes itself via a store thunk`)
-
----
-
-### Task 5: Rewire broker inspection; delete the derived-key duplication
-
-**Files:**
-- Modify: `faststream_redis_timers/broker.py`,
-  `faststream_redis_timers/subscriber/config.py`,
-  `faststream_redis_timers/configs.py`
-
-- [ ] **Step 1: Inspection through the store**
-
-  `has_pending` → `store.is_pending`; `get_pending_timers` → `store.pending`;
-  `cancel_all` → `store.cancel_all`. Delete `TimersBroker._topic_timeline_key`/
-  `._topic_payloads_key` and `TimersSubscriberConfig.topic_timeline_key`/
-  `.topic_payloads_key`. Move the raw keys off `TimersBrokerConfig` into the store.
-
-- [ ] **Step 2: Integration net** — `just test` (`test_isolation`,
-  `test_inspection`) → green.
-
-- [ ] **Step 3: Commit** (`refactor: broker inspection + key derivation own-by TimerStore`)
-
----
-
-### Task 6: Delete `subscriber/lua.py`
-
-**Files:**
-- Delete: `faststream_redis_timers/subscriber/lua.py`
-
-- [ ] **Step 1: Confirm no importers remain**
-
-  `git grep -n "subscriber.lua\|subscriber/lua\|CLAIM_LUA\|COMMIT_LUA\|eval_cached" faststream_redis_timers/`
-  → only `store.py` (its private copies). Delete the file.
-
-- [ ] **Step 2: Full suite + lint** — `just test`, `just lint` → green.
-
-- [ ] **Step 3: Commit** (`chore: drop subscriber/lua.py (folded into store.py)`)
-
----
-
-### Task 7: Promote — author the capability page
-
-**Files:**
-- Create: `architecture/timer-store.md`
-
-- [ ] **Step 1: Write the capability page**
-
-  Living prose (no frontmatter) describing the timer-store capability as it now
-  is: the seven operations, the lease/at-least-once semantics, the key scheme,
-  the self-heal. Use the glossary terms (Schedule, Due, Claim, Lease, Commit,
-  Cancel, Pending). Cross-reference `architecture/glossary.md`.
-
-- [ ] **Step 2: Finalize the bundle summary**
-
-  Edit this bundle's `design.md` `summary:` to the realized result.
-
-- [ ] **Step 3: Commit** (`docs: promote timer-store capability to architecture/`)
-
----
-
-### Task 8: Final validation
-
-- [ ] **Step 1: `just lint`** — ruff + `ty` clean (`ty: ignore`, never `type: ignore`).
-- [ ] **Step 2: `just test`** — full suite under docker compose, all green.
-- [ ] **Step 3: `just check-planning`** — `planning: OK`.
-- [ ] **Step 4: Review the diff** — `subscriber/`/`publisher/` contain no raw
-  Redis or Lua; key derivation appears once (in `store.py`).
-- [ ] **Step 5: Open the PR** per `CLAUDE.md` (push, open, watch CI).
-
----
-
-## Validation summary (post-implementation)
-
-- `faststream_redis_timers/store.py` exists; owns all `ZADD`/`HSET`/
-  `ZRANGEBYSCORE`/`ZSCORE`/`ZCARD`/`UNLINK`/`CLAIM_LUA`/`COMMIT_LUA`.
-- `subscriber/lua.py` is gone; no raw Redis in `subscriber/`/`publisher/`.
-- `commit`/`cancel`/orphan all route through `store.remove` (one Lua round-trip).
-- Derived keys (`topic_*_key`, `_topic_*_key`) are deleted; derivation lives
-  once in the store.
-- All existing integration suites pass unedited; `architecture/timer-store.md`
-  is authored.
-
-## Risks & mitigations
-
-- **Behavior drift.** The integration suites are the contract and stay unedited;
-  any red is a real regression, not a test to "fix."
-- **`store` reachability via `_outer_config` after router inclusion.** The store
-  sits on `TimersBrokerConfig` exactly like `connection`/`producer` do today, so
-  it resolves through the same merge — `test_isolation` (multi-broker) guards it.
-- **Docker required for `just test`.** If unavailable, run
-  `uv run pytest tests/test_unit.py tests/test_fake.py` as a partial check and
-  note in the PR that the Redis suites were not run locally.
diff --git a/planning/changes/2026-06-26.02-poll-schedule/design.md b/planning/changes/2026-06-26.02-poll-schedule.md
similarity index 100%
rename from planning/changes/2026-06-26.02-poll-schedule/design.md
rename to planning/changes/2026-06-26.02-poll-schedule.md
diff --git a/planning/changes/2026-06-26.02-poll-schedule/plan.md b/planning/changes/2026-06-26.02-poll-schedule/plan.md
deleted file mode 100644
index a008471..0000000
--- a/planning/changes/2026-06-26.02-poll-schedule/plan.md
+++ /dev/null
@@ -1,120 +0,0 @@
-# Poll schedule — implementation plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use
-> superpowers:subagent-driven-development (recommended) or
-> superpowers:executing-plans to implement this plan task-by-task. Steps use
-> checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Extract the inline poll-loop backoff from `TimersSubscriber._consume`
-into a pure, table-testable `PollSchedule`, leaving `_consume` with only I/O and
-control flow — no public-API or observable-timing change.
-
-**Architecture:** New `faststream_redis_timers/subscriber/schedule.py` with a
-stateful `PollSchedule` (two counters + injected jitter; methods
-`delay_after_fetch(count)` / `delay_after_error()`; named caps `_MAX_EXPONENT`,
-`_MAX_ERROR_DELAY`). `_consume` constructs it from config and sleeps for what it
-returns. See the spec ([`design.md`](./design.md)) for the seven decisions and
-the exact formulas.
-
-**Tech Stack:** Python 3.13, anyio, `uv`, `ruff`, `ty`, `pytest` (the
-`PollSchedule` unit tests need no Redis; the loop suites run under docker compose).
-
-**Spec:** [`design.md`](./design.md)
-
-**Branch:** `feat/poll-schedule`
-
-**Commit strategy:** Per-task commits. Behavior-preserving — existing loop tests
-(`test_delivery`, `_consume` start-signal + error-log unit tests,
-`test_concurrency`) stay UNEDITED and green at every step.
-
----
-
-### Task 1: Create `PollSchedule` with pure unit tests
-
-**Files:**
-- Create: `faststream_redis_timers/subscriber/schedule.py`
-- Modify: `tests/test_unit.py` (add `PollSchedule` tests)
-
-- [ ] **Step 1 (RED): Table tests first**
-
-  In `tests/test_unit.py`, add `PollSchedule` tests with injected midpoint jitter
-  (`lambda: 1.0`): busy (`delay_after_fetch(1)` → `0.0`, resets idle); idle ramp
-  (`delay_after_fetch(0)` → `base`, `2*base`, … capped at `max_idle`);
-  back-pressure (`delay_after_fetch(-1)` → `base`, idle unchanged); error ramp
-  (`delay_after_error()` → `1.0`, `2.0`, … capped at `_MAX_ERROR_DELAY`); the
-  `_MAX_EXPONENT` counter cap; reset rules (any fetch clears `error_attempt`;
-  only busy clears `idle_count`); and a `jitter=lambda: 0.5`/`1.5` bounds check.
-  Run — expect failure (module absent).
-
-- [ ] **Step 2 (GREEN): Implement `PollSchedule`**
-
-  Per design.md decisions 1-4: `__init__(*, base, max_idle, jitter=_default_jitter)`;
-  module-private `_default_jitter`, `_MAX_EXPONENT = 30`, `_MAX_ERROR_DELAY = 30.0`;
-  the two methods with the exact formulas and reset rules. No I/O.
-
-- [ ] **Step 3: Tests pass + 100%**
-
-  `uv run pytest tests/test_unit.py -v --no-cov` (iterate), then `just test` to
-  confirm the full gate (`schedule.py` must be 100% from these unit tests).
-
-- [ ] **Step 4: Commit** (`feat: add PollSchedule for poll-loop backoff`)
-
----
-
-### Task 2: Rewire `_consume` to use `PollSchedule`
-
-**Files:**
-- Modify: `faststream_redis_timers/subscriber/usecase.py`
-
-- [ ] **Step 1: Replace the inline backoff**
-
-  Construct `schedule = PollSchedule(base=…polling_interval, max_idle=…max_polling_interval)`
-  before the loop. Replace the inline `idle_count`/`error_attempt`/jitter/cap
-  logic: except branch → `delay = schedule.delay_after_error()`; else branch →
-  `delay = schedule.delay_after_fetch(fetched)`; after the `finally`,
-  `if delay: await anyio.sleep(delay)`. Remove `import random` and the
-  `_BACKOFF_EXP_CAP` constant (now in `schedule.py`). Keep the limiter, ping,
-  `start_signal`, task group, `while self.running`, and the error `self._log`.
-
-- [ ] **Step 2: Lean on the existing loop tests**
-
-  `just test` → green. Of note: `test_consume_sets_start_signal_when_ping_returns_false`
-  (start-signal ordering), `test_consume_logs_get_msgs_error_with_repr` (error
-  path), `test_delivery` (busy), `test_concurrency` (back-pressure). None should
-  need edits. Check `term-missing`; if the `if delay:` guard or a loop branch is
-  uncovered, add ONE focused test.
-
-- [ ] **Step 3: Commit** (`refactor: drive _consume backoff through PollSchedule`)
-
----
-
-### Task 3: Final validation
-
-- [ ] **Step 1: `just lint`** — ruff + `ty` clean (use `ty: ignore`); confirm
-  `import random` and `_BACKOFF_EXP_CAP` are gone from `usecase.py`.
-- [ ] **Step 2: `just test`** — full suite, 100% coverage, all green.
-- [ ] **Step 3: `just check-planning`** — `planning: OK`; finalize this bundle's
-  `summary:` to the realized result.
-- [ ] **Step 4: Open the PR** per `CLAUDE.md` (push, open, watch CI).
-
----
-
-## Validation summary (post-implementation)
-
-- `subscriber/schedule.py` exists with `PollSchedule` at 100% coverage from pure
-  unit tests; `usecase.py` has no `import random`, no `_BACKOFF_EXP_CAP`, no
-  inline backoff math.
-- `_consume` reads as fetch → decide delay → (maybe) sleep; limiter/control flow
-  unchanged.
-- All existing suites pass unedited; observable timing unchanged.
-
-## Risks & mitigations
-
-- **Backoff drift.** The new unit tests pin the exact formulas; the loop suites
-  guard integration. Any red is a real regression, not a test to "fix."
-- **`start_signal` ordering.** The sleep moves after the `finally`; preserved and
-  covered by the start-signal test. If that test goes red, the ordering is wrong —
-  stop and fix the loop, don't edit the test.
-- **Docker for `just test`.** If unavailable, `uv run pytest tests/test_unit.py
-  --no-cov` covers `PollSchedule`; note in the PR that the Redis loop suites
-  weren't run locally.
diff --git a/planning/changes/2026-06-29.01-python-3.11-3.12-support/design.md b/planning/changes/2026-06-29.01-python-3.11-3.12-support.md
similarity index 100%
rename from planning/changes/2026-06-29.01-python-3.11-3.12-support/design.md
rename to planning/changes/2026-06-29.01-python-3.11-3.12-support.md
diff --git a/planning/changes/2026-06-29.01-python-3.11-3.12-support/plan.md b/planning/changes/2026-06-29.01-python-3.11-3.12-support/plan.md
deleted file mode 100644
index 071e14a..0000000
--- a/planning/changes/2026-06-29.01-python-3.11-3.12-support/plan.md
+++ /dev/null
@@ -1,270 +0,0 @@
-# Python 3.11/3.12 Support Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Lower the supported-Python floor from 3.13 to 3.11 so the package installs and runs on 3.11, 3.12, 3.13, and 3.14.
-
-**Architecture:** Pure-Python library, no compiled extensions. Two source constructs require 3.12+ (`type` statement and `typing.override`); both are backported via `typing_extensions` (declared as a direct runtime dependency, no `sys.version_info` gating). The rest is metadata (`requires-python`, classifiers, ruff target) and a wider CI matrix.
-
-**Tech Stack:** Python, faststream 0.7, redis 8, anyio, `typing_extensions`, uv (package manager), just (task runner), ruff + ty (lint/type-check), pytest, docker compose (integration suite + Redis).
-
-## Global Constraints
-
-- New Python floor: `requires-python = ">=3.11,<4"`. All edits must remain valid on CPython 3.11 through 3.14.
-- `typing_extensions` floor is `>=4.12.0` (matches faststream's existing transitive pin; `override` has existed there since 4.4.0).
-- `import` statements live at module level only — never inside function bodies.
-- Type-checker suppressions use `# ty: ignore[...]`, never `# type: ignore`.
-- `uv.lock` is git-ignored — do not commit it. Regenerating it locally is still required so local runs resolve.
-- Coverage gate is 100% (`--cov-fail-under=100`); the full suite enforces it. Local 3.11 subset runs use `--no-cov` to bypass the gate (they are an import/runtime smoke check, not the coverage gate).
-- `typing.Self` (`broker.py:155`) stays as-is — it exists in the 3.11 stdlib.
-
----
-
-### Task 1: Make the package compatible with Python 3.11/3.12
-
-Lowers the floor, adds the `typing_extensions` dependency, and rewrites the two incompatible constructs. The pyproject floor change and the source fixes are inseparable: the `override` fix can only be proven by importing on a real 3.11 interpreter, which uv refuses until `requires-python` is lowered; and the ruff `target-version` must move to `py311` alongside the `configs.py` edit or `ruff --fix` (UP040) will revert it.
-
-**Files:**
-- Modify: `pyproject.toml` (dependencies, `requires-python`, classifiers, `[tool.ruff] target-version`)
-- Modify: `faststream_redis_timers/configs.py:17`
-- Modify: `faststream_redis_timers/registrator.py:3`
-- Modify: `faststream_redis_timers/broker.py` (import block + decorators at 150/154/159/164)
-- Modify: `faststream_redis_timers/subscriber/usecase.py` (import block + decorators at 69/164/169)
-- Regenerate (do not commit): `uv.lock`
-
-**Interfaces:**
-- Consumes: nothing from earlier tasks.
-- Produces: a package importable on 3.11; the public `RedisClient` type alias keeps its name and meaning (`"Redis[bytes] | Redis[str]"`). No public API names change.
-
-- [ ] **Step 1: Confirm the current break on 3.11 (RED)**
-
-Use the local uv-managed 3.11 interpreter to show `configs.py` does not even parse on 3.11:
-
-```bash
-PY311=/Users/kevinsmith/.local/share/uv/python/cpython-3.11.9-macos-aarch64-none/bin/python3.11
-$PY311 -m py_compile faststream_redis_timers/configs.py
-```
-
-Expected: FAIL with `SyntaxError: invalid syntax` (the PEP 695 `type` statement at line 17). This is the failing state the task fixes. (The `override` import break in the other files is an `ImportError`, not a `SyntaxError`, so it is proven later by the runtime test in Step 8, not here.)
-
-- [ ] **Step 2: Edit `pyproject.toml` — dependency, floor, classifiers, ruff target (all together)**
-
-In `[project]`, change the dependencies block from:
-
-```toml
-dependencies = [
-    "faststream>=0.7.1,<0.8",
-    "redis>=5.0",
-]
-```
-
-to:
-
-```toml
-dependencies = [
-    "faststream>=0.7.1,<0.8",
-    "redis>=5.0",
-    "typing-extensions>=4.12.0",
-]
-```
-
-Change the floor from:
-
-```toml
-requires-python = ">=3.13,<4"
-```
-
-to:
-
-```toml
-requires-python = ">=3.11,<4"
-```
-
-In the `classifiers` list, change:
-
-```toml
-    "Programming Language :: Python :: 3.13",
-    "Programming Language :: Python :: 3.14",
-```
-
-to (add 3.11 and 3.12 above 3.13):
-
-```toml
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Programming Language :: Python :: 3.14",
-```
-
-In `[tool.ruff]`, change:
-
-```toml
-target-version = "py313"
-```
-
-to:
-
-```toml
-target-version = "py311"
-```
-
-- [ ] **Step 3: Regenerate the lock and sync**
-
-Run: `uv lock --upgrade && uv sync --all-extras --all-groups`
-Expected: resolves cleanly; `typing-extensions` appears in the lock (it was already present transitively). Do NOT `git add uv.lock` — it is git-ignored.
-
-- [ ] **Step 4: Fix `configs.py` — replace the PEP 695 `type` statement**
-
-Change line 17 from:
-
-```python
-type RedisClient = "Redis[bytes] | Redis[str]"
-```
-
-to:
-
-```python
-RedisClient: TypeAlias = "Redis[bytes] | Redis[str]"
-```
-
-Add the import at the top of `configs.py`. The current first import line is `import typing`; add after it:
-
-```python
-from typing_extensions import TypeAlias
-```
-
-Leave the explanatory comment block immediately above the alias untouched.
-
-- [ ] **Step 5: Fix `registrator.py` — import `override` from `typing_extensions`**
-
-Change line 3 from:
-
-```python
-from typing import Any, override
-```
-
-to two lines:
-
-```python
-from typing import Any
-from typing_extensions import override
-```
-
-The `@override` decorator usages at lines 18 and 63 (and their `# ty: ignore[invalid-method-override]` comments) are unchanged.
-
-- [ ] **Step 6: Fix `broker.py` — import `override` from `typing_extensions`, swap decorators**
-
-`broker.py` uses `import typing` (line 2) and references `@typing.override` four times plus `typing.Self` once. Keep `import typing` (still needed for `typing.Self` and other `typing.*` uses). Add this import to the top-of-file import block (after the existing `import typing`):
-
-```python
-from typing_extensions import override
-```
-
-Then replace every `@typing.override` with `@override` (4 occurrences: lines 150, 154, 159, 164). Do NOT touch `async def __aenter__(self) -> typing.Self:` at line 155 — `typing.Self` stays.
-
-- [ ] **Step 7: Fix `subscriber/usecase.py` — import `override` from `typing_extensions`, swap decorators**
-
-This file uses `import typing` (line 3) and `@typing.override` three times. Add to the top-of-file import block (after `import typing`):
-
-```python
-from typing_extensions import override
-```
-
-Then replace every `@typing.override` with `@override` (3 occurrences: lines 69, 164, 169). Keep `import typing` (other `typing.*` uses remain).
-
-- [ ] **Step 8: Verify the package imports and the unit/fake suites pass on real 3.11 (GREEN)**
-
-These suites need no Redis. Run them on a true 3.11 interpreter via uv (now permitted because the floor is `>=3.11`):
-
-```bash
-uv run --python 3.11 pytest tests/test_unit.py tests/test_fake.py --no-cov -v
-```
-
-Expected: PASS. This proves both fixes at runtime on 3.11 — the `configs.py` parse fix and that `typing_extensions.override` imports cleanly where `typing.override` would have raised `ImportError`.
-
-If `uv run --python 3.11` is awkward in the environment, the fallback is an explicit ephemeral env:
-
-```bash
-uv venv --python 3.11 /private/tmp/claude-501/-Users-kevinsmith-src-pypi-faststream-redis-timers/b6781fe7-4d7e-4081-b268-8696cf7ad9e6/scratchpad/v311
-VIRTUAL_ENV=/private/tmp/claude-501/-Users-kevinsmith-src-pypi-faststream-redis-timers/b6781fe7-4d7e-4081-b268-8696cf7ad9e6/scratchpad/v311 uv sync --all-extras --all-groups
-VIRTUAL_ENV=/private/tmp/claude-501/-Users-kevinsmith-src-pypi-faststream-redis-timers/b6781fe7-4d7e-4081-b268-8696cf7ad9e6/scratchpad/v311 uv run --no-sync pytest tests/test_unit.py tests/test_fake.py --no-cov -v
-```
-
-- [ ] **Step 9: Lint against the new floor**
-
-Run: `just lint-ci`
-Expected: PASS. Specifically confirms (a) ruff under `target-version = "py311"` accepts `RedisClient: TypeAlias = ...` and does NOT flag it for conversion back to the `type` statement (UP040 only fires at py312+), and (b) `ty` accepts `typing_extensions.override` and `typing.Self`.
-
-- [ ] **Step 10: Run the full suite (no regression on 3.13 + 100% coverage)**
-
-Run: `just test`
-Expected: PASS, coverage 100%. This is the docker integration run (Redis on 3.13); confirms the source changes did not regress the existing platform.
-
-- [ ] **Step 11: Commit**
-
-```bash
-git add pyproject.toml faststream_redis_timers/configs.py faststream_redis_timers/registrator.py faststream_redis_timers/broker.py faststream_redis_timers/subscriber/usecase.py
-git commit -m "feat: support Python 3.11 and 3.12
-
-Backport the PEP 695 type alias and typing.override via typing_extensions,
-lower requires-python to >=3.11, add 3.11/3.12 classifiers and ruff target.
-
-Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>"
-```
-
----
-
-### Task 2: Add 3.11 and 3.12 to the CI test matrix
-
-The pytest job in CI currently runs only 3.13 and 3.14. Extend it so the new floor is exercised on every PR.
-
-**Files:**
-- Modify: `.github/workflows/_checks.yml` (the `pytest` job's `strategy.matrix.python-version`)
-
-**Interfaces:**
-- Consumes: the 3.11-compatible package from Task 1.
-- Produces: nothing consumed by later tasks (terminal task).
-
-- [ ] **Step 1: Edit the matrix**
-
-In the `pytest` job, change:
-
-```yaml
-        python-version:
-          - "3.13"
-          - "3.14"
-```
-
-to:
-
-```yaml
-        python-version:
-          - "3.11"
-          - "3.12"
-          - "3.13"
-          - "3.14"
-```
-
-Leave the `lint` job (which runs `uv python install 3.13`) unchanged — linting against one interpreter is sufficient and ruff's `target-version` already enforces the floor.
-
-- [ ] **Step 2: Validate the workflow YAML parses**
-
-Run: `uv run python -c "import yaml; yaml.safe_load(open('.github/workflows/_checks.yml')); print('yaml ok')"`
-Expected: prints `yaml ok` with no exception. (`pyyaml` is available transitively via the dev tooling; if it is not, `python -c "import yaml"` will fail and you can skip this step — the edit is a 2-line list addition.)
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add .github/workflows/_checks.yml
-git commit -m "ci: run pytest matrix on Python 3.11 and 3.12
-
-Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>"
-```
-
----
-
-## Notes for the finish
-
-- `Dockerfile` stays on `python:3.13-slim` — it is the dev/test image, not a supported-version gate; no change.
-- No `architecture/` page or doc references the version floor, so no capability promotion is required (verified during planning).
-- After both tasks: push the branch and open a PR (do not local-merge); watch CI — the new 3.11/3.12 matrix legs are the real cross-version proof.
diff --git a/planning/index.py b/planning/index.py
index a1632e1..2d70ac3 100644
--- a/planning/index.py
+++ b/planning/index.py
@@ -1,14 +1,12 @@
-# ruff: noqa: INP001, D212  # planning/ is not a Python package; D212/D213 conflict differs from faststream-outbox
-"""
-Generate the planning index from frontmatter.
+# ruff: noqa: INP001  # planning/ is not a Python package (this file is vendored into consumers' planning/)
+"""Generate the planning index from frontmatter.
 
-Run via ``just index``. Globs ``planning/changes/*/`` (each bundle's
-``design.md``, falling back to ``change.md``) and ``planning/decisions/*.md``,
-reads their frontmatter, and prints a Markdown listing to stdout — changes
-then decisions, newest-first. Never writes a file:
+Run via ``just index``. Globs ``planning/changes/*.md`` and
+``planning/decisions/*.md``, reads their frontmatter, and prints a Markdown
+listing to stdout — changes then decisions, newest-first. Never writes a file:
 the listing is a query over the files, not a committed artifact.
 
-``date`` and ``slug`` are derived from the directory / file name, not
+``date`` and ``slug`` are derived from the file name, not
 frontmatter — the name is the single source of truth for both.
 """
 
@@ -17,12 +15,10 @@
 import sys
 
 
-CHANGES_DIR = pathlib.Path(__file__).parent / "changes"
-DECISIONS_DIR = pathlib.Path(__file__).parent / "decisions"
+ROOT = pathlib.Path(__file__).parent
 VALID_DECISION_STATUS = {"accepted", "superseded"}
-BUNDLE_RE = re.compile(r"^(?P<date>\d{4}-\d{2}-\d{2})\.\d{2}-(?P<slug>.+)$")
+CHANGE_RE = re.compile(r"^(?P<date>\d{4}-\d{2}-\d{2})\.\d{2}-(?P<slug>.+)$")
 DECISION_RE = re.compile(r"^(?P<date>\d{4}-\d{2}-\d{2})-(?P<slug>.+)$")
-ALLOWED_BUNDLE_FILES = {"design.md", "plan.md", "change.md"}
 SPEC_REQUIRED = ("summary",)
 DECISION_REQUIRED = ("status", "summary")
 
@@ -47,7 +43,7 @@ def parse_frontmatter(text: str) -> dict[str, str]:
 
 
 def _named(fields: dict[str, str], name: str, pattern: re.Pattern[str]) -> dict[str, str]:
-    """Inject ``date``/``slug`` derived from a dir/file name into ``fields``."""
+    """Inject ``date``/``slug`` derived from a file name into ``fields``."""
     match = pattern.match(name)
     if match:
         fields["date"] = match.group("date")
@@ -55,32 +51,29 @@ def _named(fields: dict[str, str], name: str, pattern: re.Pattern[str]) -> dict[
     return fields
 
 
-def load_bundles() -> list[dict[str, str]]:
-    """Read each bundle's summary; derive date/slug from the directory name."""
-    bundles: list[dict[str, str]] = []
-    if not CHANGES_DIR.is_dir():
-        return bundles
-    for bundle in sorted(CHANGES_DIR.iterdir()):
-        if not bundle.is_dir():
-            continue
-        spec = bundle / "design.md"
-        if not spec.exists():
-            spec = bundle / "change.md"
-        if not spec.exists():
+def load_changes(root: pathlib.Path) -> list[dict[str, str]]:
+    """Read each change file's summary; derive date/slug from the file name."""
+    changes_dir = root / "changes"
+    changes: list[dict[str, str]] = []
+    if not changes_dir.is_dir():
+        return changes
+    for path in sorted(changes_dir.glob("*.md")):
+        if path.name == "README.md" or path.name.startswith(("_", ".")):
             continue
-        fields = _named(parse_frontmatter(spec.read_text(encoding="utf-8")), bundle.name, BUNDLE_RE)
-        fields["path"] = f"changes/{bundle.name}/{spec.name}"
-        fields["name"] = bundle.name
-        bundles.append(fields)
-    return bundles
+        fields = _named(parse_frontmatter(path.read_text(encoding="utf-8")), path.stem, CHANGE_RE)
+        fields["path"] = f"changes/{path.name}"
+        fields["name"] = path.stem
+        changes.append(fields)
+    return changes
 
 
-def load_decisions() -> list[dict[str, str]]:
+def load_decisions(root: pathlib.Path) -> list[dict[str, str]]:
     """Read each decision's frontmatter; derive date/slug from the file name."""
+    decisions_dir = root / "decisions"
     decisions: list[dict[str, str]] = []
-    if not DECISIONS_DIR.is_dir():
+    if not decisions_dir.is_dir():
         return decisions
-    for path in sorted(DECISIONS_DIR.glob("*.md")):
+    for path in sorted(decisions_dir.glob("*.md")):
         if path.name == "README.md" or path.name.startswith("_"):
             continue
         fields = _named(parse_frontmatter(path.read_text(encoding="utf-8")), path.stem, DECISION_RE)
@@ -90,24 +83,24 @@ def load_decisions() -> list[dict[str, str]]:
     return decisions
 
 
-def format_row(bundle: dict[str, str]) -> str:
-    """Render one bundle as a Markdown list item."""
-    slug = bundle.get("slug", "?")
-    path = bundle.get("path", "")
-    date = bundle.get("date", "")
-    summary = bundle.get("summary") or "(no summary)"
+def format_row(row: dict[str, str]) -> str:
+    """Render one change or decision as a Markdown list item."""
+    slug = row.get("slug", "?")
+    path = row.get("path", "")
+    date = row.get("date", "")
+    summary = row.get("summary") or "(no summary)"
     line = f"- **[{slug}]({path})** ({date}) — {summary}"
-    if bundle.get("supersedes"):
-        line += f" _(supersedes {bundle['supersedes']})_"
-    if bundle.get("superseded_by"):
-        line += f" _(superseded by {bundle['superseded_by']})_"
+    if row.get("supersedes"):
+        line += f" _(supersedes {row['supersedes']})_"
+    if row.get("superseded_by"):
+        line += f" _(superseded by {row['superseded_by']})_"
     return line
 
 
-def render(bundles: list[dict[str, str]], decisions: list[dict[str, str]]) -> str:
+def render(changes: list[dict[str, str]], decisions: list[dict[str, str]]) -> str:
     """Render the full Markdown listing: changes then decisions, newest-first."""
     out = ["# Planning index", "", "_Generated by `just index` — do not edit._", "", "## Changes", ""]
-    change_rows = sorted(bundles, key=lambda b: b.get("name", ""), reverse=True)
+    change_rows = sorted(changes, key=lambda b: b.get("name", ""), reverse=True)
     out += [format_row(b) for b in change_rows] if change_rows else ["_None._"]
     out += ["", "## Decisions", ""]
     decision_rows = sorted(decisions, key=lambda d: d.get("name", ""), reverse=True)
@@ -121,32 +114,15 @@ def _require(fields: dict[str, str], keys: tuple[str, ...], rel: str, violations
     violations.extend(f"{rel}: missing or empty frontmatter key '{key}'" for key in keys if not fields.get(key))
 
 
-def _check_spec_file(path: pathlib.Path, rel: str, violations: list[str]) -> None:
-    """Validate a design.md / change.md spec file (requires `summary`)."""
+def _check_change(path: pathlib.Path, violations: list[str]) -> None:
+    """Validate one change file (requires `summary`)."""
+    rel = f"changes/{path.name}"
+    if CHANGE_RE.match(path.stem) is None:
+        violations.append(f"{rel}: file name is not 'YYYY-MM-DD.NN-slug.md'")
     fields = parse_frontmatter(path.read_text(encoding="utf-8"))
     _require(fields, SPEC_REQUIRED, rel, violations)
 
 
-def _check_bundle(bundle: pathlib.Path, violations: list[str]) -> None:
-    """Validate one change bundle directory."""
-    rel = f"changes/{bundle.name}"
-    if BUNDLE_RE.match(bundle.name) is None:
-        violations.append(f"{rel}: directory name is not 'YYYY-MM-DD.NN-slug'")
-    violations.extend(
-        f"{rel}/{child.name}: unexpected file in bundle (allowed: {', '.join(sorted(ALLOWED_BUNDLE_FILES))})"
-        for child in sorted(bundle.iterdir())
-        if child.name not in ALLOWED_BUNDLE_FILES
-    )
-    design = bundle / "design.md"
-    change = bundle / "change.md"
-    if not design.exists() and not change.exists():
-        violations.append(f"{rel}: bundle has neither design.md nor change.md")
-    for spec_file in (design, change):
-        if spec_file.exists():
-            _check_spec_file(spec_file, f"{rel}/{spec_file.name}", violations)
-    # plan.md carries no frontmatter — its identity comes from the bundle dir.
-
-
 def _check_decision(path: pathlib.Path, violations: list[str]) -> None:
     """Validate one decision file (requires `status` + `summary`)."""
     rel = f"decisions/{path.name}"
@@ -159,25 +135,39 @@ def _check_decision(path: pathlib.Path, violations: list[str]) -> None:
         violations.append(f"{rel}: invalid status '{status}' (allowed: {', '.join(sorted(VALID_DECISION_STATUS))})")
 
 
-def check() -> list[str]:
-    """Validate every bundle and decision; return the list of violation strings."""
+def check(root: pathlib.Path) -> list[str]:
+    """Validate every change file and decision; return the list of violation strings."""
     violations: list[str] = []
-    if CHANGES_DIR.is_dir():
-        for bundle in sorted(CHANGES_DIR.iterdir()):
-            if bundle.is_dir():
-                _check_bundle(bundle, violations)
-    if DECISIONS_DIR.is_dir():
-        for path in sorted(DECISIONS_DIR.glob("*.md")):
+    changes_dir = root / "changes"
+    decisions_dir = root / "decisions"
+    if changes_dir.is_dir():
+        for path in sorted(changes_dir.iterdir()):
+            if path.is_dir():
+                violations.append(
+                    f"changes/{path.name}: directory found — convention 2.0.0 uses flat change files "
+                    f"(changes/YYYY-MM-DD.NN-slug.md; see CHANGELOG 2.0.0 for the migration)"
+                )
+                continue
+            if path.name == "README.md" or path.name.startswith(("_", ".")):
+                continue
+            if path.suffix != ".md":
+                violations.append(f"changes/{path.name}: unexpected non-md file in changes/")
+            else:
+                _check_change(path, violations)
+    if decisions_dir.is_dir():
+        for path in sorted(decisions_dir.glob("*.md")):
             if path.name == "README.md" or path.name.startswith("_"):
                 continue
             _check_decision(path, violations)
     return violations
 
 
-def main() -> int:
-    """Print the listing to stdout, or validate bundles with --check."""
-    if "--check" in sys.argv[1:]:
-        violations = check()
+def main(argv: list[str] | None = None, root: pathlib.Path | None = None) -> int:
+    """Print the listing to stdout, or validate change files and decisions with --check."""
+    argv = sys.argv[1:] if argv is None else argv
+    root = ROOT if root is None else root
+    if "--check" in argv:
+        violations = check(root)
         if violations:
             sys.stderr.write(f"planning: {len(violations)} violation(s)\n")
             for violation in violations:
@@ -185,7 +175,7 @@ def main() -> int:
             return 1
         sys.stdout.write("planning: OK\n")
         return 0
-    sys.stdout.write(render(load_bundles(), load_decisions()))
+    sys.stdout.write(render(load_changes(root), load_decisions(root)))
     return 0
 
 

From d4a0d542872ed08573fa5fce280b03271b165d3f Mon Sep 17 00:00:00 2001
From: Artur Shiriev <lesnik512@gmail.com>
Date: Wed, 8 Jul 2026 10:29:53 +0300
Subject: [PATCH 2/4] docs(planning): merge 2.0.0 convention prose, retire
 bundle wording

Replace the Quick path/Conventions span in planning/README.md with the
canonical 2.0.0 body (flat change files, no folder bundles). Update
CLAUDE.md and Justfile prose from "bundle" to "change file"/"change" to
match.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 CLAUDE.md          | 14 ++++----
 Justfile           |  2 +-
 planning/README.md | 79 +++++++++++++++++++++++++++-------------------
 3 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 49334b2..1d2a9e5 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -11,7 +11,7 @@ source of truth for recipes — run `just --list` or read it. The non-obvious bi
   forward to pytest. `tests/test_unit.py` + `tests/test_fake.py` need no Redis;
   the rest (the integration suites) do.
 - `just lint` / `just lint-ci` — autofix vs non-mutating; `lint-ci` also runs the
-  planning-bundle validator (`planning/index.py --check`).
+  planning-change validator (`planning/index.py --check`).
 - Verifying a Python-version / interpreter-compat change: run the **full** suite
   on the target interpreter (the CI matrix, or `just test` in docker), not just
   the no-Redis subset. An integration-only failure — e.g. a broker-shutdown hang
@@ -21,14 +21,14 @@ source of truth for recipes — run `just --list` or read it. The non-obvious bi
 ## Workflow
 
 Planning uses a portable convention — `architecture/` (repo root) is the living
-**truth home** and promotion target; `planning/changes/` holds the per-change
-bundles. Start at the
+**truth home** and promotion target; `planning/changes/` holds the flat
+change files. Start at the
 [Quick path](planning/README.md#quick-path-start-here) in
 [`planning/README.md`](planning/README.md) (the authoritative spec) to pick a
-lane — **Full** (`design.md` + `plan.md`), **Lightweight** (single `change.md`),
-or **Tiny** (just a commit) — and ship. `just check-planning` validates bundles;
-`just index` prints the change + decision listing; `planning/_templates/` are
-copy-and-fill starting points.
+lane — **Full** (design template), **Lightweight** (change template),
+or **Tiny** (just a commit) — and ship. `just check-planning` validates
+change files; `just index` prints the change + decision listing;
+`planning/_templates/` are copy-and-fill starting points.
 
 ## Architecture
 
diff --git a/Justfile b/Justfile
index 8b66705..d141a5a 100644
--- a/Justfile
+++ b/Justfile
@@ -33,7 +33,7 @@ lint-ci:
 index:
     uv run python planning/index.py
 
-# Validate planning bundles + decisions; CI runs this.
+# Validate planning changes + decisions; CI runs this.
 check-planning:
     uv run python planning/index.py --check
 
diff --git a/planning/README.md b/planning/README.md
index 776d8f7..18527db 100644
--- a/planning/README.md
+++ b/planning/README.md
@@ -13,25 +13,22 @@ truth about *what the system does now* lives in
 **1. Choose a lane — first matching rule wins:**
 
 1. Any of: needs design judgment · new file/module · public-API change ·
-   cross-cutting or multi-file · non-trivial test design → **Full**
-   (`design.md` + `plan.md`)
+   cross-cutting or multi-file · non-trivial test design → **Full** (design template)
 2. Purely mechanical: typo · dep bump · linter/formatter/CI tweak ·
-   mechanical rename · single-line config → **Tiny** (no bundle, conventional
+   mechanical rename · single-line config → **Tiny** (no change file, conventional
    commit)
 3. Small-but-real, none of the above: ≲30 LOC net · ≤2 files · no new file ·
-   no public-API change · one straightforward test → **Lightweight**
-   (`change.md`)
+   no public-API change · one straightforward test → **Lightweight** (change template)
 
-Ambiguous between two? Take the heavier. A `change.md` that outgrows its lane
-splits into `design.md` + `plan.md`.
+Ambiguous between two? Take the heavier. A lightweight change file that outgrows its lane is rewritten from the design template.
 
-**2. Create the bundle** (Full / Lightweight only):
-`planning/changes/YYYY-MM-DD.NN-<slug>/`, where `.NN` is a zero-padded
-intra-day counter. Copy the matching template from
+**2. Create the change file** (Full / Lightweight only):
+`planning/changes/YYYY-MM-DD.NN-<slug>.md`, where `.NN` is a zero-padded
+intra-day counter — copied from the matching template (design or change) in
 [`_templates/`](_templates/).
 
 **3. Ship in the implementing PR:** hand-edit the affected
-`architecture/<capability>.md`, finalize the bundle's `summary:` to the
+`architecture/<capability>.md`, finalize the change file's `summary:` to the
 realized result, and run `just check-planning` before pushing.
 
 ## Conventions
@@ -47,14 +44,14 @@ realized result, and run `just check-planning` before pushing.
 - **`architecture/` (repo root) — the present.** One file per capability, plus
   a single `glossary.md` (the ubiquitous language); living prose, updated in the
   same PR that ships the change. The truth home.
-- **`planning/changes/` — the past-and-pending.** One folder per change,
+- **`planning/changes/` — the past-and-pending.** One file per change,
   kept in place after ship.
 
 A change **promotes** its conclusions into the affected
 `architecture/<capability>.md` by hand **in the implementing PR, alongside the
 code** — the edit rides in the same diff and is reviewed with it, never applied
 as a separate post-merge step. That hand-edit is what keeps `architecture/`
-true; the bundle stays in `changes/` as the *why*.
+true; the change file stays in `changes/` as the *why*.
 
 ### Glossary
 
@@ -76,9 +73,9 @@ Keep it a glossary, not a spec — no implementation detail. A change that
 introduces or sharpens a term updates `glossary.md` in the same PR, the same way
 a behavior change promotes into a capability file.
 
-### Change bundles
+### Change files
 
-A change is a folder `changes/YYYY-MM-DD.NN-<slug>/`:
+A change is a file `changes/YYYY-MM-DD.NN-<slug>.md`:
 
 - `YYYY-MM-DD` — proposal date; `.NN` — zero-padded intra-day counter
   (`.01`, `.02`, …) that breaks same-date ties so the timeline sorts stably.
@@ -87,25 +84,44 @@ A change is a folder `changes/YYYY-MM-DD.NN-<slug>/`:
 `summary` is written when the change is created (the intent one-liner) and
 **finalized at ship** to state the realized result — set in the implementing
 PR, alongside the code and the `architecture/` promotion. No post-merge
-bookkeeping, no folder move. `date` and `slug` are never written — they are
-read from the bundle's directory name.
+bookkeeping, no file move. `date` and `slug` are never written — they are
+read from the file name.
 
 ### Three lanes
 
 | Lane | Artifacts | Use when |
 |------|-----------|----------|
-| **Full** | `design.md` + `plan.md` | design judgment; new file/module; public-API change; cross-cutting/multi-file; non-trivial test design |
-| **Lightweight** | `change.md` | small-but-real: ≲30 LOC net, ≤2 files, no new file, no public-API change, single straightforward test |
+| **Full** | one change file from the design template | design judgment; new file/module; public-API change; cross-cutting/multi-file; non-trivial test design |
+| **Lightweight** | one change file from the change template | small-but-real: ≲30 LOC net, ≤2 files, no new file, no public-API change, single straightforward test |
 | **Tiny** | none — conventional commit | typo, dep bump, linter/formatter/CI tweak, mechanical rename, single-line config |
 
-Heavier lane wins on ambiguity. A `change.md` that outgrows its lane splits
-into `design.md` + `plan.md`.
+Heavier lane wins on ambiguity. A lightweight change file that outgrows its lane is rewritten from the design template.
+
+### Plans are ephemeral
+
+The executable plan — task checklists, embedded code, commit sequences,
+whatever the executor needs — is a working artifact, not history. Keep it out
+of `changes/` and out of version control (git-ignored scratch, e.g.
+`.superpowers/`). Once the change ships, the diff and the PR are the record
+of execution; a committed plan duplicates them. `check-planning` rejects
+anything in `changes/` that is not a flat change file.
+
+### Lean specs
+
+The change file is the single home of a change's rationale:
+
+- The PR body summarizes and links to the change file — it never restates it.
+- Rejected alternatives live in `decisions/` and are referenced, not retold.
+- Show a sketch when the design needs code; never the full diff-to-be.
+- Delete template sections that don't apply — an empty section is ceremony.
+- Most designs fit well under ~700 words; length must buy information.
 
 ### Artifacts at a glance
 
-- **`design.md`** — the spec: the *thinking* (why, design, trade-offs, scope).
-- **`plan.md`** — the plan: the *sequencing* (the executor's task checklist).
-- **`change.md`** — both, condensed, for the lightweight lane.
+- **design template** — the spec: the *thinking* (why, design, trade-offs,
+  scope); the change file it produces is the single home of rationale (see
+  [Lean specs](#lean-specs)).
+- **change template** — the condensed spec for the lightweight lane.
 - **`releases/<semver>.md`** — per-release user-facing notes.
 - **`audits/<date>-<slug>.md`** — findings from a code/docs/bug-hunt sweep;
   spawns fix changes.
@@ -119,11 +135,10 @@ Templates live in [`_templates/`](_templates/).
 
 ### Frontmatter
 
-`date` and `slug` are **derived from the directory / file name** — never
+`date` and `slug` are **derived from the file name** — never
 repeated in frontmatter. So:
 
-- `design.md` / `change.md`: `summary` (single line) only.
-- `plan.md`: **no frontmatter** — its identity is the bundle directory.
+- `changes/*.md`: `summary` (single line) only.
 - `decisions/*.md`: `status` (accepted|superseded), `summary`, and optional
   `supersedes` / `superseded_by`.
 - Files in `architecture/` carry **no** frontmatter — living prose, dated by git.
@@ -136,9 +151,9 @@ only field the index renders.
 
 The listing is **generated**, not maintained — run `just index` to print it: a
 flat, newest-first list of changes, then decisions newest-first. The frontmatter
-in each bundle / decision file is the single source of truth; there is no
-committed copy to drift. Run `just check-planning` to validate every bundle and
-decision.
+in each change / decision file is the single source of truth; there is no
+committed copy to drift. Run `just check-planning` to validate every change
+and decision.
 
 ## Other
 
@@ -147,8 +162,8 @@ decision.
   authored over time as the system grows.
 - **[`architecture/glossary.md`](../architecture/glossary.md)** — the ubiquitous
   language: the domain terms code, specs, and capability pages share.
-- **[changes/](changes/)** — the per-change bundles (`design.md` + `plan.md`,
-  or a single `change.md`).
+- **[changes/](changes/)** — the per-change files (one change file from the
+  design template, or one from the change template).
 - **[decisions/](decisions/)** — design decisions taken (and alternatives
   rejected), each with a revisit trigger; indexed by `just index`.
 - **[releases/](releases/)** — per-release user-facing notes; the release

From 2f51ffd07d878abc3a851b166f797ccc82346ff1 Mon Sep 17 00:00:00 2001
From: Artur Shiriev <lesnik512@gmail.com>
Date: Wed, 8 Jul 2026 10:29:58 +0300
Subject: [PATCH 3/4] chore(planning): bump convention to 2.0.0

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 planning/.convention-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/planning/.convention-version b/planning/.convention-version
index 9084fa2..227cea2 100644
--- a/planning/.convention-version
+++ b/planning/.convention-version
@@ -1 +1 @@
-1.1.0
+2.0.0

From 0d68f65863bc3c0b4021a0104642f30675fad7a2 Mon Sep 17 00:00:00 2001
From: Artur Shiriev <lesnik512@gmail.com>
Date: Wed, 8 Jul 2026 12:19:19 +0300
Subject: [PATCH 4/4] docs: retire "change bundle" wording in living-truth
 prose

Promotion-rule prose now says "change file" (2.0.0 flat-file model).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 architecture/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/architecture/README.md b/architecture/README.md
index 2dce1fb..d99e7d5 100644
--- a/architecture/README.md
+++ b/architecture/README.md
@@ -34,5 +34,5 @@ system's behavior is documented.
 Shipping a change hand-edits the affected capability file(s) here to match the
 new reality, in the same PR as the code. When a change alters a capability's
 behavior, update the matching `architecture/<capability>.md` in the same PR. The
-change bundle stays in place under
+change file stays in place under
 [`../planning/changes/`](../planning/changes/) — no folder move.