Release 0.18.0 (#192)

OPT-15 and OPT-20 rows: the retry is two inverters only, and OPT-20 no
longer claims no other battery moves. SAFETY-111 added to known issues.
MAINT-19 marked as from code reading. Wording fixes in the SAFETY-112 and
MAINT-11 rows, UX-38 and the price service note.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

goodwe_controller/CHANGELOG.md

@@ -1,5 +1,84 @@
 # Changelog
 
+## 0.18.0
+
+**A minor bump: new behaviour, three new options and one new value for an
+existing option.** No option was removed or renamed, and no default of an
+existing option changed (83 options -> 86). **Existing installs need no option
+change:** options that start 0.17.0 also start 0.18.0, and the new options are
+off or empty until you use them. The changes below apply with one inverter or
+two, unless a line says "Two inverters".
+
+New options, and what they do if you leave them alone:
+
+| option | default | left alone |
+|---|---|---|
+| `pv_forecast_entities`, `pv_forecast_tomorrow_entities` | `[]` | the single forecast sensors work as before ([[OPT-17]]) |
+| `price_service_token` | empty | not used; it is read only with `price_provider: price_service` ([[PRICE-01]]) |
+
+`price_provider` also accepts a new value, `price_service`. Its default is
+unchanged, so the price source stays as it is.
+
+**Price service.** The new price source `price_service` reads prices from the
+add-on's price server, with the token you were given. If it does not answer,
+prices come from energy-charts.info, then from the prices the add-on saved.
+Sites on the Home Assistant price sensors or a fixed tariff need no change. To
+move a site over, see `DOCS.md`, "Moving a site from the Home Assistant price
+sensors to `price_service`".
+
+Contents of this release, in merge order since 0.17.0 (`e36565f`):
+
+| | |
+|---|---|
+| `3050fa5` | The solar forecast can come from several sensors, added up, for example one per inverter. If one of them has no reading, that day's forecast is not used, and the status says which one. The single sensor still works ([[OPT-17]]) |
+| `e3e4ba6` | While Home Assistant is still starting, the page now says "Waiting for Home Assistant" and the log says the add-on waits, instead of looking like a fault. Control itself is unchanged: it starts when Home Assistant answers ([[SAFETY-112]]) |
+| `79dd077` | Battery modes on only: a charge in a cheap run no longer stops at the start of a new 15-minute period, and with two inverters a battery that refused to charge is tried again every 15 min. In one test, the export at the end of a charge was 48 W where the code before this fix gave 746 W ([[OPT-15]]) |
+| `0ce7d35` | Two inverters: each battery card has Start cycle and Stop cycle buttons, so you can start or stop the cycle on the battery you choose. Only one battery can cycle at a time, and a second start is refused with a short message ([[MAINT-11]]) |
+| `bf9019e` | New price source `price_service`. If it fails, prices come from energy-charts.info, then from saved prices. With no price at all and the monthly cycle on, a notice shows and the cycle waits ([[PRICE-01]]) |
+| `004f859` | Two inverters, battery modes on: the 15-minute retry of a battery that refused to charge now asks that battery for 200 W, and no longer puts the rest of the charge on another battery. In the test, without this fix, a battery in its maintenance charge took about 2,300 W for about 34 s at each retry ([[OPT-20]]) |
+
+### Known issues
+
+- A false "Battery is not keeping up" can still show when the peak guard pauses a maintenance charge ([[SAFETY-92]]).
+- A battery capped at a low limit with a perfectly flat reading can still trip the stale check ([[SAFETY-74]]).
+- A battery whose reading at rest is beyond about ±175 W is still not caught when it refuses ([[SAFETY-97]]).
+- The peak guard can still back off near the end of a 15-minute period when a meter reading is late, by less than 30 s ([[SAFETY-99]]).
+- Two inverters: the maintenance charge can switch on and off while the house is above the peak aim ([[SAFETY-88]]).
+- Two inverters: the "circulating" figure counts a battery's reading at rest ([[SAFETY-98]]).
+- Two inverters: a drain that starts during a big step in house use can send the other battery to full power, and about 1 kW goes to the grid for about 10 s ([[SAFETY-104]]).
+- Two inverters: when a battery comes back during a maintenance charge, the grid can step by several kW at once ([[SAFETY-101]]).
+- Two inverters: when a battery drops out during a solar surplus, the others can swing by up to 1.5 kW in a simulation ([[SAFETY-105]]).
+- Two inverters: after a drain ends, a change in house use can go unanswered for about 9 s, because some readings are old ([[SAFETY-106]]).
+- Two inverters: when one battery's level is missing, both batteries are held at 0 W, and for about 15 s the last command stays on ([[SAFETY-108]]).
+- Two inverters: if one battery's level stays missing for 12 h, the other battery's cycle can be marked failed, with a 7-day wait and a notice, though it is healthy. This comes from reading the code; it has not been seen on a site ([[MAINT-17]]).
+- When the 15-minute demand forecast sensor counts the battery's own charge, the maintenance charge runs at about half the power the peak limit leaves, so it takes about twice as long. Seen on a site: about 1.2 kW instead of 2.5 kW, and the peak limit was kept ([[SAFETY-111]]).
+- One inverter: after a link drop, the battery's own safety stop to 0 W can be taken as a refusal, and the site stays at 0 W for up to 15 min ([[SAFETY-102]]).
+- After a Home Assistant restart, control still waits until Home Assistant has finished starting, which can take several minutes, though the readings are already there ([[SAFETY-115]]).
+- While Home Assistant is not answering, the page can list inverters as refusing commands and sensors as missing, and send you to Developer Tools, though they are fine ([[UX-37]]).
+- If Home Assistant hangs or stops, the page keeps saying "Waiting for Home Assistant" and never turns into an alarm ([[SAFETY-113]]).
+- Right after Home Assistant has started, the page can say for about 4 s that an inverter cannot be controlled, and the first command can come late ([[SAFETY-114]]).
+- After a Home Assistant restart, the controller status sensor can still say "running" while the add-on cannot control. It was seen once, and the cause is not known ([[SAFETY-116]]).
+- Battery modes on: after a planned top-up from the grid, the Batteries screen can say "Enough sun is forecast" ([[UX-32]]).
+- Battery modes on: the forecast line "we count on" can show more sun than the plan counts, because the plan takes house use off first ([[UX-33]]).
+- Battery modes on: before a planned top-up, the Today list shows a smaller "gives" amount than the plan will use; it grows as the charge happens ([[UX-34]]).
+- Two inverters, battery modes on: while the other battery is in its maintenance charge, a battery's card can say it charges from the grid while it stays at 0 W ([[OPT-18]]).
+- Two inverters, battery modes on: while a battery refuses to charge in a cheap run, the action log on the page gets about 8 lines an hour for its retries, and the page hint says "waiting for a better price" ([[UX-38]]).
+- A battery in a safety stop, or one the add-on cannot reach, can still be started for a cycle, and its drain then waits about 12 h and ends in a failed-cycle notice. This comes from reading the code; it has not been seen on a site ([[MAINT-19]]).
+- On the Settings page, the rows of the solar forecast lists are labelled "Phase 1", "Phase 2" instead of "Sensor 1", "Sensor 2" ([[UX-27]]).
+- In the solar forecast list, a blank or repeated row makes "source 2 of 2" count differently from the rows on the Settings page ([[UX-28]]).
+- The solar forecast message says "has no reading" also when the sensor shows a number that is too old or in the wrong unit ([[UX-29]]).
+- If you use only the forecast lists, two Settings notes sit on the single-sensor field, and one of them tells you to set that field ([[UX-30]]).
+- After a restart during a price outage, the "No prices" message can say "yet" when prices did come in earlier ([[UX-39]]).
+- On the new settings page, you cannot see whether a price service token is set. Check the Configuration tab ([[UX-41]]).
+- On the classic settings page, the first click on Save after editing a field can do nothing. Click again ([[UX-42]]).
+
+### If you are crossing from a version older than 0.10.0
+
+`## 0.10.0` below can refuse an old config: `slew_w` above its limit, and the
+withdrawn `price_provider` ids `engie_dynamic`, `totalenergies_dynamic` and
+`eneco_eddy`. Read it before you update. Run `tools/predeploy_check.py` with the
+bare options (`jq '.data.options'`) first.
+
 ## 0.17.0
 
 **A minor bump: changed behaviour, and no option changes.** No option was

goodwe_controller/DECISIONS/MAINT-11-cycle-per-battery.md

@@ -0,0 +1,37 @@
+# MAINT-11 - start or stop the maintenance cycle per battery
+
+**Status: for review.** Tests: `test_maint11.py`. No option added.
+
+**The fault.** At two or more batteries the page had one "start a battery cycle"
+button, and `_maint_button()` chose the battery. An operator could not cycle a
+chosen one (inverter B, new after storage, needed its first cycle).
+
+## Rule
+
+1. `maint_start` and `maint_abort` take an optional `unit`. With no unit they
+   run the old code unchanged. The Batteries screen sends the unit from a
+   per-battery Start cycle and Stop cycle button, at two or more batteries only.
+2. **A start while any battery holds the maintenance slot is refused, not
+   queued.** The message names the battery that is cycling. One slot per site
+   stays the rule, and the scheduler is untouched.
+3. Also refused, with a plain message: an unknown unit, a start on a battery
+   that is switched off (battery modes on), and a stop on a battery that is not
+   cycling. Nothing changes on a refusal.
+4. A stop on the cycling battery is today's abort: the cycle ends, then every
+   inverter goes to 0 W.
+
+## Why refuse and not queue
+
+A queued start is a cycle that begins hours later, unseen, after the operator
+has moved on. A refusal is immediate and says why. The scheduler already
+queues by waiting time, so nothing is lost.
+
+## What this does not cover
+
+- Today's bare button never refused a battery that is refusing to give power
+  (SAFETY-73); its drain waits. The per-battery start does the same.
+- A start on the battery that is already cycling is refused as "busy", where
+  the bare button restarts its drain. The bare button is unchanged.
+- At one battery, a request that names the battery uses the new path, so a
+  second start is refused instead of restarting the drain. Nothing sends a name
+  at one battery, and the bare request is unchanged.

goodwe_controller/DECISIONS/OPT-11-battery-modes.md

@@ -50,7 +50,7 @@ P1 is its section 6 P1, and the pull request lists what was measured.
     needs its own run to clear the spread (without: a night charge was spent
     on flat morning prices, then charging went on at them);
   - a run edge reseeds the loop at the house's level (a 3 kW import spike
-    removed; about 0.1 x rating still overshoots as export).
+    removed) and, since OPT-15, holds it there until the meter shows the step.
 - Replay (tools/opt11p3_replay.py, 16 recorded days, EPEX hourly prices a
   year earlier, modelled batteries), net EUR, lower is better: P2 19.33, P3
   Solar first + Leftover solar 19.57, with a sale 19.60, the old one-period
@@ -75,6 +75,80 @@ P1 is its section 6 P1, and the pull request lists what was measured.
   P2's 19.33; Solar first + Cheap hours only 19.57.
 - Not done in P3: the forecast (P4), and a headroom too short for the run
   moving the rest to the next cheap periods.
+- OPT-15 (TEST-23 findings on 5a4cdc2, merged up to e3e4ba6,
+  `test_price_run_fixes.py`):
+  - F1, a charge stopped at a quarter edge and latched for the quarter. The
+    P1 averager opens a quarter only when a sample arrives, and the HA source
+    builds one 0.35 s after the reading, so the cycle on the boundary still
+    saw the old block: "no seconds left", headroom None, "no trade
+    (headroom)", latched for the new quarter. With modes on the guard now
+    projects the quarter `now` is in (`PeakTracker.project(roll=True)`,
+    crediting the held sample as the averager will), and only a measured
+    stop latches. Modes off still reads the old block (identity).
+    Since SAFETY-91, `next_quarter()` does the same for the guard at two
+    inverters (no stop there without the roll, same banked quarters); the
+    roll is what covers one inverter, where the old projection stops the
+    charge at every edge. With modes on at one inverter the roll also removes
+    the 1 s 0 W command at each quarter edge that SAFETY-81's sim showed, so
+    its modes-on digests are re-pinned (modes off equal to e3e4ba6). A
+    rolled projection is not graded by SAFETY-81's alarm (the old edge tick
+    read "no seconds left"), so a standing overload is still notified once
+    per quarter.
+  - F2, -1120 W export at a charge end against -257 W modelled. The replay
+    acted every 5 s on readings of that instant, and by then the lagged
+    battery had nearly arrived, so it never acted on a reading that still
+    showed the trade. The add-on cycles on each meter update (1 s on the rig)
+    on readings 1-2 s old: the two cycles after the reseed saw the trade's
+    +3300 W and slewed E up 555 W each. The loop now holds E until the meter
+    reaches the target (or `EDGE_HOLD_S`, 18 s; to 36 s while the battery
+    still moves). The replay gained `Lag` (dead time, reading age, the P1
+    debounce, 1 s cycles). Charge end, 800 W house: -10 to -51 W over eight
+    lag variants; without the hold -1370 W (meter 2 s). On e3e4ba6 the same
+    numbers hold. The hold gives the loop the target as its grid, so it
+    yields to SAFETY-95's drain tail, and any other claim that moves the
+    command ends it.
+  - F3, a charge refusal in a cheap run was never probed: the SAFETY-73 pin
+    stands only while the site asks that way, and nothing asked to charge.
+    Probing was chosen over changing the card: the probe is 200 W for 34 s
+    each 15 min under the same peak gates, and it wins back the run. In its
+    probe window the refusing battery is a charger, pinned at 200 W by its
+    own claim, and the others rest. A monthly drain (SAFETY-78) still comes
+    first, and with a day plan a probing Leftover solar battery goes only to
+    its planned level. At one inverter SAFETY-52 already ends a charge
+    refusal as soon as the house asks for power.
+  - Not fixed, same on e3e4ba6: with lagged readings a headroom-sized quarter
+    banks up to 1.4 W over the aim (48.6 W under the cap), and a battery
+    reading older than the meter can make a charge start look like a house
+    over the aim, a real guard stop.
+  - Review: an unmeasured stop that never latched let a headroom missing
+    every other cycle flip the charge 1799 times in 30 min, so the second one
+    in a quarter latches (at most 4 changes a quarter). A house that rises
+    1, 2 or 3 kW as the charge ends, from 30 s into the quarter to 15 s
+    before its end (two inverters, lagged readings): the hold adds at most
+    +33 W to that quarter against the loop without it, and the most any
+    quarter banks is 3431 W with the charge sized to the aim (3450 W; the cap
+    is 3500 W), 3456 W with a slow 8 s battery (the lag's own, the same on
+    e3e4ba6). The import during the hold is the rise, below the charge's
+    own, and a rise past that is the peak floor's, which ends the hold.
+    A maintenance drain, hold or charge that starts during the hold ends it
+    on that tick (replayed at edge + 3 s).
+- OPT-20 (TEST-23 OPT-15 g7, `test_opt20.py`): a probe asks only PROBE_W.
+  The trade was sized at the probing battery's rating (2500 W), B's pin held
+  200 W of it, and the allocator put the other 2300 W on A, in its
+  maintenance charge phase (no mode range there, so nothing kept it out):
+  grid 3100 W for 34 s. Now the ask is PROBE_W for the probing battery plus
+  what the other chargers would have had without the probe (none: 200 W
+  alone), and it carries the pin only on the ticks the pin is filed (the
+  window's first and last cycle moved another battery's share by 200 W).
+  - Chosen: the probe sits on top of a headroom-sized charge, so beside a
+    normal charger its command is the same and the grid rises 200 W (about
+    7 W on the quarter) rather than that charger giving 200 W up. A probe
+    that the headroom or the bound cannot hold at 200 W is not filed.
+  - Unchanged, same on bf9019e: with a charge ask the other batteries cannot
+    give (one sign), so an idle-looking A that gives the house stops for the
+    window and the grid rises by what it gave. The trade line now says 200 W
+    for a probe alone; its words are UX-38's. The base P4 F4 path (a normal
+    trade on a battery in maintenance charge) is not touched.
 
 ## P4: the solar forecast and the day plan (2026-09-29)
 - Input: a Home Assistant forecast sensor (`pv_forecast_entity`, kWh left

goodwe_controller/DECISIONS/PRICE-01-own-price-server.md

@@ -0,0 +1,117 @@
+# PRICE-01 - the owner's price server as the price source, with fallbacks
+
+**Status: for review.** Tests: `test_price_service.py`. One option added,
+`price_service_token` (password). Follows [[TARIFF-10]], whose section 4 this
+card answers for one provider. Design: the owner's price service note of
+2026-10-05. Owner go 2026-10-05 and 2026-10-14.
+
+## What it is
+
+`price_provider: price_service` reads `GET https://prices.kammenstraatha.duckdns.org/v1/dayahead/BE`
+with `Authorization: Bearer <token>`. The answer is the energy-charts layout
+plus `covers`, so the existing columnar parser reads it. The price is wholesale
+energy only; the framework adds markup and taxes, as for `generic_dayahead`.
+
+## Rules
+
+1. **The host is a constant in the plugin**, declared as its only egress host,
+   HTTPS only. The operator's `price_feed_url` is not read by this provider.
+   *Cost:* every client talks to the one host, and moving the server is a new
+   add-on version. *What replaces the per-site setting:* the egress allow-list,
+   TLS, and a token per client that the server can revoke.
+2. **The chain is server, then energy-charts, then the saved prices**
+   (`app/price_chain.py`). A step counts only if it has a price for *now*: a
+   server that answers with old prices is skipped like one that is down. A step
+   down and a step up are each one log line, written when the step changes. The
+   operator's `price_feed_url` is cleared for the energy-charts step, which is
+   asked for its own feed.
+3. **The saved prices are `/data/price_history.json`**, the file `PriceHistory`
+   already keeps (the last three Brussels days of what was published). They are
+   the all-in prices as stored; a change of markup shows from the next fetch
+   that works. A read from the store is not filed again.
+4. **No price for now** means no published price covers the present moment. Not
+   "none for the coming hours": before about 13:00 tomorrow's prices are not
+   published on any healthy day, and carried hours are already marked estimated.
+   It sets one status row (*Prices*), one Home plan line (English and Dutch),
+   and one notification (*No prices*, English and Dutch), taken down when a
+   price returns. A start-up before the first refresh finished is not a gap.
+   The notification is not re-asserted after a Home Assistant core restart
+   (SAFETY-34 does that for latched safety alarms); the status row stays.
+   *Open for the owner:* if "coming hours" should mean a look-ahead of N hours,
+   that is a change to `gate_for()` and `PriceWatch`, not to the chain.
+5. **The maintenance charge gate** (owner's decision, 2026-10-14): the charge may
+   run when the *current 15-minute price is at or below today's average*, today
+   being the Brussels day, computed from the provider's prices. This is the rule
+   the Home Assistant pair gave (`price_service.yaml`), so a site that moves from
+   the pair to the provider does not change when the maintenance charge runs.
+   It is not `TariffPlan.cheap_now()` (strictly below the mean of the firm
+   hours of the whole plan). This replaces, for this provider only,
+   TARIFF-10 section 4: its three reasons are answered as follows. (1) Two
+   writers: the pair beside a provider stays refused; `static_profile` beside
+   `price_service` is accepted and no longer writes `cheap`. (2) An expired or
+   absent plan shuts the gate (the charge waits), as an unavailable HA sensor
+   did. (3) The basis is the one above, not `cheap_now()`.
+6. **The token is a secret.** `password?` in the schema; hidden on the settings
+   page (`uilayout.HIDDEN`), which can keep `price_service` but not choose it;
+   never put in a message by the plugin; taken out of any reason text by
+   `price.scrub()`; the real transport reports only a status or an exception's
+   name. validate.py refuses `price_service` with no token, a token with a
+   space or line break, and one under 16 characters (so `scrub()`, which skips
+   values under 4 characters, always has something to take out). Round 2: the
+   token is in no page and no JSON answer of the web app. Every `password`
+   option of the schema is shown as `********` (set) or empty, in
+   `/config/model` (`options`, `running`, `ui`) and in a stale refusal; the
+   classic page draws it as a password field; a save or a validate that sends
+   `********` or nothing keeps the stored value, any other value replaces it.
+   A token can therefore be changed but not cleared from the page.
+7. **A fixed tariff beside `price_service` is allowed and quietly noted.** It is
+   still the plan's last fallback (`resolve_tariff` -> `_degrade`); only the
+   cheap window and the gate ignore it, because they read the provider's
+   prices. Keeping it set is the recommended setup, and clearing it triggers the
+   "static_profile is empty" warning, so no notification (round 2's *Fixed
+   tariff not used* was false and fired on every sound start; round 3 removed
+   it). Instead one INFO line at start (English, as every log line) and an info
+   note beside the setting (EN and NL, "With the price service, the fixed
+   tariff is only used if no prices are available."), both
+   only with a non-blank `static_profile` (whitespace counts as blank). At
+   start the add-on dismisses the old notification id, in case a pre-release
+   build raised it.
+8. **The no-price words show only with the maintenance charge on** (owner,
+   2026-10-14): the status row, the Home line and the notification say
+   'maintenance waits', so with `maintenance_enabled` off none is shown.
+
+## Where the gate equals the Home Assistant pair, and where it does not
+
+Equal: `test_price_service.py` section 8 feeds the same day both ways, to the
+rules in `price_service.yaml` (price at the quarter, average of today's
+quarters rounded to 0.00001 EUR/kWh, `<=`), over 6 days including both
+clock-change days, at three instants in every period, and through a real
+`Controller` for a whole day. Every answer is the same.
+
+Not equal, by design or by arithmetic:
+
+- The comparison is made on all-in prices. With a flat taxes figure and a
+  markup and taxes of at most five decimals the offset cancels and the answer
+  is the same. With `price_taxes_profile` (an hour-varying levy) the all-in
+  prices differ by hour, so the answer can differ from the wholesale comparison
+  the HA sensors made. A site on that profile should check before moving.
+- A quarter within 0.00001 EUR/kWh of the average can differ if markup or taxes
+  have more than five decimals.
+- The plan is retired when no refresh has succeeded for 90 minutes
+  (`TARIFF_MAX_AGE_S`) and the gate shuts then. How long the HA pair kept an
+  answer after its REST sensor stopped updating was not measured here.
+- The average is over the firm prices the provider holds for today. After a
+  restart in the middle of a day with only the saved part of today, it is the
+  average of that part.
+
+## Not covered
+
+- **No real answer of the server was seen.** No token was available. The
+  layout is the design's; `test_price_service.py` uses a mock and, for the
+  parser, the real energy-charts capture reshaped with the design's extra keys.
+  The first capture from the live server (rig test) should replace the mock.
+- The 429 limit (about 60 calls an hour) is not approached: one fetch per
+  30 minutes, and at most two requests when the server fails.
+- Battery modes read the plan as for `generic_dayahead` and were not changed.
+- The `price_service` REST and template sensors in Home Assistant are not
+  touched; they stop being read when the pair is cleared.

goodwe_controller/DOCS.md

@@ -222,6 +222,7 @@ The label and description each setting shows on the Configuration tab, in tab or
 | Tariff | Your own injection formula | `price_export_formula` | Optional. The injection formula from your tariff card, in the same shape as your own tariff formula. Leave it empty to use the flat injection price. |
 | Tariff | Price CSV file | `price_csv_path` | For manual_csv only. Where in /share the add-on reads your price file. |
 | Tariff | Price feed URL override | `price_feed_url` | Leave it empty to use the source's own feed. An override is sent exactly as typed and often returns only one day. |
+| Tariff | Price service token | `price_service_token` | For the price service only. The token you were given for it. Leave it empty with any other price source. |
 | Tariff | Price look-ahead (hours) | `price_horizon_h` | How many hours of prices to ask the source for. |
 | Tariff | Price request timeout (s) | `price_timeout_s` | How long one request to the price source may take before it is given up. |
 | Tariff | Current price entity (older) | `price_now_entity` | The older way to get a price, used only to charge in a cheap window during maintenance. Do not combine it with a dynamic price source. |
@@ -290,6 +291,7 @@ When the add-on refuses to start, each reason names the setting by its label and
 - **Fixed or day/night tariff** (`static_profile`): the periods must cover every day type exactly once with no gap and no overlap, and a gap is refused rather than filled. A window 22:00-07:00 on mon-fri does not cover Saturday morning, so a weekend row is required. See [Static day/night and fully-fixed tariffs](#static-daynight-and-fully-fixed-tariffs-static_profile).
 - **Your own tariff and injection formula** (`price_formula`, `price_export_formula`): type the card's numbers in the card's units. The `card` block is required on the tariff formula: the add-on recomputes the card's example price and refuses to start if it does not come out. Injection is VAT-exempt in Belgium, so `vat_pct` there is normally 0. See [Your own tariff formula](#your-own-tariff-formula-custom_formula) and [`price_export_formula`, field by field](#price_export_formula-field-by-field).
 - **Price feed URL override** (`price_feed_url`): only a host the chosen source declares is accepted. Nothing is added to the URL, not even the date range, so an override often returns one day and the rest of the plan is carried over and excluded from trading. The log warns on every refresh.
+- **Price service token** (`price_service_token`): a password field. Every page of the add-on, and every answer its web app gives, shows only `********` when a token is set and nothing when not; the token itself is never sent to a page. A save that leaves the field empty or as `********` keeps the stored token, and a new value replaces it. It must be at least 16 characters. It is needed with `price_provider: price_service`, and the add-on refuses to start without it. It never appears in the log, the status page, a refusal or a notification. See [`price_service`](#price_service--your-own-price-server-and-what-it-falls-back-to).
 - **Current and average price entities** (`price_now_entity`, `price_avg_entity`): kept because removing them would take the maintenance cycle's only price signal away from a live site.
 - **Trade on the price spread** (`arbitrage_enabled`): off as shipped, on purpose, because it moves energy against the meter by design. It needs a price source and a P1 meter, and the add-on refuses combinations that cannot work.
 - **Battery cycle cost** (`cycle_cost_threshold_eur`): wear plus conversion losses. It is not derived from a measurement: 0.10 is a product decision still open with the owner (OPT-08). At this value a fixed day/night site does not trade, since a realistic Belgian day/night spread is about 0.08 EUR/kWh.
@@ -555,10 +557,10 @@ With battery modes on, these choices replace the *Charging and selling on price*
 
 **What always comes first.**
 - The peak limit, the safety stops and the monthly cycle come before a battery's mode.
-- A grid charge is sized so the 15-minute period stays under the peak limit less its margin (`peak_margin_w`). It starts only at 500 W or more. Once the peak limit stops it, it stays off for the rest of that 15-minute period.
+- A grid charge is sized so the 15-minute period stays under the peak limit less its margin (`peak_margin_w`). It starts only at 500 W or more. Once the peak limit stops it, it stays off for the rest of that 15-minute period. The start of a new period does not stop it.
 - While one battery charges from the grid, the others rest, and the house uses the grid.
 - While one battery empties for its monthly cycle, no battery charges from the grid.
-- A battery that refuses to charge or give power takes no part in a run in that direction.
+- A battery that refuses to charge or give power takes no part in a run in that direction. In a cheap run it is still tested every 15 minutes: it charges at 200 W for about half a minute while the others rest.
 
 **In Home Assistant.** With MQTT set up, each battery also gets a *Mode* list and a *Use* switch, for example `select.goodwe_inverter_a_mode` and `switch.goodwe_inverter_a_use`. They do the same as the Batteries screen. Turn battery modes off and restart, and they are removed.
 
@@ -566,7 +568,7 @@ With battery modes on, these choices replace the *Charging and selling on price*
 
 *For installers:* a mode is a limit at priority 35, kept apart from the hard limits. It gives way only as far as a limit above it (the peak guard) needs. A mode range always holds 0 W, so a mode can forbid a direction and never force one. With one inverter the mode also bounds the loop. The record is `DECISIONS/OPT-11-battery-modes.md`.
 
-*For installers:* when a charge or sale ends, the loop restarts at the house's own level rather than at the trade's watts. On the replay model that removes a ~3 kW import spike after a 2.5 kW charge and halves the settling time; about 0.1 × the battery's power still overshoots as export. The *Mode* list gains *Cheap hours only* in Home Assistant, at the end.
+*For installers:* when a charge or sale ends, the loop restarts at the house's own level rather than at the trade's watts, and holds there until the meter shows the change (at most 18 s, up to 36 s while the battery is still moving). This removes the ~3 kW import spike after a 2.5 kW charge and the export overshoot that readings a second or two old caused (-1120 W on the test rig); with the hold it stays within 0.15 × the battery's power. The *Mode* list gains *Cheap hours only* in Home Assistant, at the end.
 
 ### Reading the grid-following loop: `Loop integrator`, `Loop integrator lead`, `Loop reason`
 
@@ -2198,20 +2200,24 @@ does, and only after you have read why.
 > `static_profile` below needs no network at all, so its cheap window is
 > computed on every cycle and reaches the maintenance cycle's grid top-up
 > whether or not arbitrage is armed. ⚠️ **And it is still the only source of
-> that window.** A provider-backed plan now exists on every configured site,
-> but *Cheap window* and the maintenance cycle's grid top-up read
-> `static_profile` and nothing else — a deliberate limit, recorded with what it
-> would take to change in `DECISIONS/TARIFF-10-fetching-is-not-trading.md`.
+> that window, with one exception.** A provider-backed plan exists on every
+> configured site, but *Cheap window* and the maintenance cycle's grid top-up
+> read `static_profile` and nothing else — a deliberate limit, recorded with
+> what it would take to change in
+> `DECISIONS/TARIFF-10-fetching-is-not-trading.md`. The exception is
+> `price_service` (PRICE-01): with it, the window comes from the provider's own
+> prices, as described under [`price_service`](#price_service--your-own-price-server-and-what-it-falls-back-to).
 
 | option | meaning |
 |---|---|
-| `price_provider` | `off` (default) or one of the three plugins below |
+| `price_provider` | `off` (default) or one of the plugins below |
 | `price_markup_eur_kwh` | Your supplier's margin, EUR/kWh. **Added only when the chosen plugin's feed does not already contain it** |
 | `price_taxes_eur_kwh` | Distribution, levies and VAT, EUR/kWh. Same rule. Defaults to **0.11736** — a real Flemish figure, and **yours is probably different**: see *What `price_taxes_eur_kwh` is made of* below |
 | `export_price_eur_kwh` | The **flat injection** price, EUR/kWh. May be negative — see below |
 | `price_export_formula` | The **injection formula**, if your contract has one. Same shape as `price_formula`, its own coefficients, its own `vat_pct` — see below |
 | `price_csv_path` | Where `manual_csv` reads its file |
 | `price_feed_url` | Override the plugin's default feed. Used **exactly as written** — the add-on appends nothing to it, including the date range, so an override gets whatever horizon that URL returns. Only a host the plugin itself declares is accepted |
+| `price_service_token` | The token for `price_service`. A password field. Empty with any other source |
 | `price_horizon_h` | How far ahead to ask for, hours |
 | `price_timeout_s` | Per-request timeout |
 | `static_profile` | A static day/night or fully-fixed tariff. Empty by default — see below |
@@ -2224,6 +2230,7 @@ arbitrage decision wrong by that amount, in a direction nothing reports.
 | plugin | product | the published figure contains | the add-on adds |
 |---|---|---|---|
 | `generic_dayahead` | day-ahead | energy only (wholesale EPEX BE) | markup **and** taxes |
+| `price_service` | day-ahead | energy only (wholesale, from your own price server) | markup **and** taxes |
 | `custom_formula` | day-ahead | energy **and** your contract's markup — your card's `Tariefformule` line | taxes |
 | `manual_csv` | day-ahead | everything, all-in | nothing |
 
@@ -2253,6 +2260,86 @@ from. Any alias would have to invent the numbers your battery is priced against.
 Eneco's dynamic product is *Zon & Wind Dynamisch*, and it is indexed to
 Belpex/EPEX **day-ahead**, not to imbalance.)
 
+#### `price_service` — your own price server, and what it falls back to
+
+*For installers: PRICE-01. The decision is in
+`DECISIONS/PRICE-01-own-price-server.md`.*
+
+`price_provider: price_service` reads the day-ahead prices for Belgium from the
+owner's price server, `https://prices.kammenstraatha.duckdns.org/v1/dayahead/BE`.
+The host is fixed in the add-on and only HTTPS is used. The token goes in
+`price_service_token` and is sent as `Authorization: Bearer <token>`. The server
+answers the energy-charts layout, so the same parser reads it. The price is the
+wholesale energy price and nothing else, so the add-on adds your markup and
+taxes exactly as for `generic_dayahead`.
+
+**Where the prices come from.** Each step is used only if it has a price for
+now. A server that answers with last night's prices is treated as down.
+
+| Step | Source | When it is used | What the log says (once per change) |
+|---|---|---|---|
+| 1 | The price server | It answers, with a price for now | `The price service answers again.` on the way back. |
+| 2 | energy-charts.info | Step 1 fails: down, timeout, refused token (401), error (5xx), a damaged answer, or no price for now | `The price service does not answer, so prices come from energy-charts.` Or `The price service refused the token, so prices come from energy-charts.` |
+| 3 | The prices saved in `/data/price_history.json` | Steps 1 and 2 fail | `No price source answers, so the add-on uses the prices it saved.` |
+| none | Nothing | No saved price covers now either | `No price source answers, and no saved price covers now.` |
+
+The saved prices are the last answers that worked, kept on disk, so a site
+whose server and energy-charts are both down for a day goes on planning from
+what it has. It keeps the days the history holds (today, tomorrow once it was
+fetched, and a day back). They are the all-in prices as stored: a change of
+markup or taxes shows from the next fetch that works. Going back up the chain
+is logged once as well: `Prices come from energy-charts again.` and `The price
+service answers again.` The refresh runs every 30 minutes.
+
+**When there is no price for now (step none).** One status line, `Prices: No
+prices since 00:00, maintenance waits.` (on the add-on page; the Home screen says
+the same in English and Dutch), and one notification, *No prices*. Both go when a
+source has a price for now again. They show only while **Run the monthly battery cycle**
+(`maintenance_enabled`) is on; with it off, neither is shown. "Since" is the moment the last price ran out.
+Before the first refresh has finished there is no line, so a start-up is not a
+gap. Control is not touched: the battery follows the meter as ever, battery
+modes and trading read what prices there are, and only the maintenance charge
+waits.
+
+**The maintenance charge and the cheap window.** With this provider the
+maintenance charge gate reads the provider's prices and no Home Assistant
+entity. It keeps the rule the Home Assistant pair gave: the charge may run
+when the **current 15-minute price is at or below today's average**, today
+being the Brussels day. Moving a site from the pair to `price_service` does not
+change when the charge runs. Where the two can differ is listed in the decision
+record: the Home Assistant average was rounded to 0.00001 EUR/kWh, and so is
+this one before it is compared. With no price for now the gate is shut, as it
+was when an entity was unavailable. *Cheap window* on the status page shows this
+answer. This is not the *cheap hours* rule of battery modes and not
+`cheap_now()`.
+
+**Moving a site from the Home Assistant price sensors to `price_service`.**
+Do this on the Configuration tab, in one save, and restart once:
+
+1. Set **Dynamic price source** (`price_provider`) to `price_service`.
+2. Paste the token into **Price service token** (`price_service_token`).
+3. **Clear** **Current price entity** (`price_now_entity`) and **Average price
+   entity** (`price_avg_entity`). The add-on refuses to start with a price
+   source and these two together.
+4. Check **Supplier markup** and **Distribution, levies and VAT**. With the
+   Home Assistant pair they decided nothing about the maintenance charge. With
+   the provider they are added to the wholesale price, so they set the prices
+   shown on the page and, if battery modes or trading are on, the prices those
+   decide on. The maintenance charge gate does not depend on them.
+5. Keep **Fixed or day/night tariff** (`static_profile`) if you have one; it
+   is fine to leave it set. It is the plan's last fallback: it is used,
+   marked as estimated and without trading, only when no source has a price.
+   *Cheap window* and the maintenance charge never read it: the provider's
+   prices decide them. The add-on logs one INFO line at start ("Fixed tariff
+   is only used if no prices are available.") and shows the same note beside
+   the setting. Nothing needs clearing, and clearing it only removes the
+   fallback (the settings page then warns that the site has no tariff while the
+   price feed is down).
+6. Remove the `price_service` REST and template sensors from Home Assistant
+   when you are satisfied. They are no longer read.
+
+To go back: put the two entities back, set the source to `off`, and restart.
+
 #### So what should a Belgian dynamic-tariff customer do today?
 
 **Honestly: `generic_dayahead` gets you close, and you should know exactly how
@@ -2809,6 +2896,9 @@ uses the result as a cheap-window hint for the maintenance charge. They are
 — configure two of them and the add-on refuses to start, naming the conflict,
 because the add-on reads exactly one and the loser is silent. Use one.
 
+To move a site off them onto the owner's price server, see [`price_service`](#price_service--your-own-price-server-and-what-it-falls-back-to):
+it lists which options to set and which to clear.
+
 ### The three buckets — which price components can move a decision
 
 *For installers: card TARIFF-17.*
@@ -3282,8 +3372,22 @@ days before it tries again, so it does not empty the battery every night. To
 try sooner, start a cycle on the add-on page. If it keeps happening, check that
 the battery follows its commands and that the cheap hours leave time to charge.
 
+### No prices
+
+No price source has a price for the present moment: not the price server,
+not energy-charts, and nothing saved. The monthly battery cycle waits, because
+it will not charge from the grid without a price to judge by. Control of the
+battery goes on as before. Check that the add-on can reach the internet and that
+the price service token is right. The notification goes by itself when a price
+is back. It is shown only while the monthly battery cycle is switched on.
+
 ### For installers: notifications
 
+A fixed tariff beside the price service raises no notification: it is the
+plan's last fallback, not a fault. An earlier pre-release build raised a card
+with the id `goodwe_fixed_tariff_unused`; the add-on takes that id down at every
+start, which does nothing when it is absent.
+
 This part is for installers. The texts live in `app/messages.py` and follow
 `STYLE.md`. Every notification keeps a fixed `notification_id`, so a repeat
 replaces the card. The ERROR or WARNING line of the add-on log names the
@@ -3302,6 +3406,7 @@ default `info` hides it.
 | *name* is not delivering | alarm | `goodwe_not_delivering_<name>` | SAFETY-42 |
 | Meter reading may be stuck | alarm | `goodwe_meter_frozen` | SAFETY-18 |
 | Battery cycle did not finish | warning | `goodwe_maint_failed_<name>` | MAINT-13 |
+| No prices | warning | `goodwe_no_prices` | PRICE-01 |
 
 **The Details link.** Home Assistant 2026.2 and newer show add-on pages at
 `/config/app/<slug>/documentation`; 2026.5 removed the old
@@ -3413,6 +3518,11 @@ day's price runs.
 An Off battery that the peak limit still needs says so, with the power it
 gives: "Off, but gives 0.5 kW for the peak limit."
 
+With two or more batteries, each card also has **Start cycle** and **Stop
+cycle**, to run the monthly cycle on that battery now. Only one battery cycles
+at a time: a start while another battery is cycling, or on a battery that is
+switched off, is refused and the message names the battery.
+
 **Settings** opens on the **Simple** view, or on the view you last picked:
 the peak limit, the batteries' switches and modes, and shadow mode, each
 marked "Applies right away" or "Applies after a restart". **Installer** shows
@@ -3494,6 +3604,7 @@ for a new install*.
 | Direction check, Site direction check | Whether each inverter's power goes the way the add-on asks. *Opposite for 12 of 60 seconds* counts toward a stop. When it stops, the inverter, or every inverter, is set to 0 W until you start control. |
 | Check for inverters working against each other, Inverters worked against each other | Only with several inverters. See *Inverters working against each other*. |
 | Delivery check, *name* is not delivering | Only with several inverters. See *An inverter is not delivering*. |
+| Prices | Only while no price source has a price for now: *No prices since 00:00, maintenance waits.* See *No prices* under Notifications. |
 | Solar production | Your solar production. Sources are numbered in the order of “Solar production entities, per inverter”. A strongly negative reading by day means that entity reads the wrong way round: add it to “Reversed-sign solar entities”. |
 
 ### For installers: status page

goodwe_controller/app/config_page.py

@@ -221,6 +221,11 @@ function makeInput(field, value, onchange){
       input.step = field.type === 'integer' ? '1' : 'any';
       if(field.min !== undefined) input.min = field.min;
       if(field.max !== undefined) input.max = field.max;
+    } else if(field.type === 'password'){
+      input.type = 'password';
+      input.autocomplete = 'new-password';
+      input.autocapitalize = 'none';
+      input.spellcheck = false;
     } else {
       input.type = 'text';
       input.autocapitalize = 'none';

goodwe_controller/app/configui.py

@@ -206,6 +206,8 @@ def _one_field(node, translations, lang, path=()):
         "multiple": bool(node.get("multiple")),
         "unit": unit_of(key),
     }
+    if node.get("format") == "password":
+        field["type"] = "password"
     if node.get("lengthMin") is not None:
         field["min"] = node["lengthMin"]
     if node.get("lengthMax") is not None:
@@ -306,6 +308,52 @@ def problems_by_field(problems, keys):
     return by_key, unanchored
 
 
+# --------------------------------------------------------------------------- #
+# SECRETS (PRICE-01 F1). A `password` option never leaves this process in a page
+# or a JSON answer. The pages get SECRET_SHOWN when one is set and "" when not.
+# A save that sends SECRET_SHOWN or nothing keeps the stored value; any other
+# value replaces it. The names come from the Supervisor's own schema, so a
+# password option added later is covered without an edit here.
+# --------------------------------------------------------------------------- #
+SECRET_SHOWN = "********"
+
+
+def secret_keys(schema, extra=()):
+    """Names of the options whose schema type is `password`, plus `extra`."""
+    # The Supervisor may spell it `type: password` or `type: string` with
+    # `format: password`; both count.
+    return frozenset(str(n.get("name")) for n in schema or ()
+                     if isinstance(n, dict) and (
+                         n.get("type") == "password"
+                         or n.get("format") == "password")
+                     ) | frozenset(extra)
+
+
+def hide_secrets(value, keys):
+    """A copy of `value` with every secret key's value replaced by
+    SECRET_SHOWN (set) or "" (empty), at any depth."""
+    if isinstance(value, dict):
+        return {k: ((SECRET_SHOWN if v else "") if k in keys
+                    else hide_secrets(v, keys))
+                for k, v in value.items()}
+    if isinstance(value, list):
+        return [hide_secrets(v, keys) for v in value]
+    return value
+
+
+def keep_secrets(proposed, stored, keys):
+    """`proposed` with each secret the page did not change put back from
+    `stored`: absent, empty or SECRET_SHOWN means 'leave it'."""
+    out = dict(proposed)
+    for key in keys:
+        if out.get(key) in (None, "", SECRET_SHOWN):
+            if isinstance(stored, dict) and key in stored:
+                out[key] = stored[key]
+            elif key in out and out[key] == SECRET_SHOWN:
+                out[key] = ""
+    return out
+
+
 def changed_keys(left, right):
     """Sorted keys whose values differ between two option blobs.
 

goodwe_controller/app/homeview.py

@@ -582,6 +582,8 @@ def build_plan(c, now, shadow, running, held=False, settled=True):
         cyc, waits = maintenance_runs(c, day0, day1, now, shadow)
         runs += cyc
         lines += waits
+        if getattr(c, "price_gap", False):
+            lines.append(line_no_prices(c.price_gap_since, now))
         runs += peak_run(c, day0, day1, now, shadow, limit_w)
         if c.p1_enabled:
             # The guard's ceiling: the cap, or this month's peak once above it.
@@ -1268,6 +1270,17 @@ def line_cycle_waits(name) -> str:
     return _t("cycle_waits", name=name)
 
 
+def line_no_prices(since, now) -> str:
+    """PRICE-01: no price covers now. `since` is an instant or None."""
+    if since is None:
+        return _t("no_prices_yet")
+    local, today = brussels(since), brussels(now)
+    if local.date() == today.date():
+        return _t("no_prices_since", at=f"{local:%H:%M}")
+    return _t("no_prices_since_day", day=local.day, month=month_name(local),
+              at=f"{local:%H:%M}")
+
+
 def line_peak_limit(limit_w, shadow) -> str:
     return _w(shadow, "step_in", kw=_kw(limit_w))
 
@@ -1387,6 +1400,16 @@ def _samples() -> list:
             ("plan", run_house_why()), ("plan", run_house_why(True)),
             ("plan", run_house_amount()),
             ("plan", line_cycle_waits("Battery B")),
+            ("plan", line_no_prices(None, datetime(2026, 10, 14, 9, 0,
+                                                   tzinfo=timezone.utc))),
+            ("plan", line_no_prices(datetime(2026, 10, 14, 0, 0,
+                                             tzinfo=timezone.utc),
+                                    datetime(2026, 10, 14, 9, 0,
+                                             tzinfo=timezone.utc))),
+            ("plan", line_no_prices(datetime(2026, 10, 13, 22, 0,
+                                             tzinfo=timezone.utc),
+                                    datetime(2026, 10, 14, 9, 0,
+                                             tzinfo=timezone.utc))),
             ("plan", line_prices(0.16, {"eur_kwh": 0.14, "label": "13:00"},
                                  {"eur_kwh": 0.36, "label": "19:00"})),
             ("plan", line_prices(None, None, None)),

goodwe_controller/app/main.py

@@ -90,6 +90,8 @@ from .p1 import P1Ingest, build_source, is_enabled
 from .price import Absence, Uncertainty, brussels, price_option, provider_configured
 from .price import required_spread as price_required_spread
 from .price import uncertainty_of as price_uncertainty_of
+from .price_chain import (PriceWatch, fixed_tariff_beside_service, gate_for,
+                          uses_chain)
 from .price_history import PriceHistory
 from .static_tariff import resolve_tariff, static_gated, static_status
 from .tariff import PeakStore, PeakTracker, next_quarter
@@ -238,6 +240,9 @@ def load_options() -> dict:
 # OPT-11 P3: how long the last cheap run stays the price stored energy is
 # valued at (`priceruns.plan(ref_eur_kwh=)`): the rest of that day.
 REF_CHEAP_KEEP = timedelta(hours=12)
+# OPT-15: the longest a run edge holds the loop at E waiting for the meter to
+# show the step: the plant's measured step time (control.PLANT_SETTLE_S).
+EDGE_HOLD_S = _ctl.PLANT_SETTLE_S
 
 # OPT-11 P4: the store key of the house profile (dayplan.HouseProfile), and
 # how often the forecast sensors are read (they change hourly at most).
@@ -968,6 +973,7 @@ class Controller:
         self.peak_unmeasured_s = 0.0
         self._peak_alarm_block = None
         self._peak_high_since = None
+        self._peak_rolled = False      # OPT-15
         self._peak_floor_limited = False
         # SAFETY-87: the reserve alarm's hold, as SAFETY-81's above.
         self._reserve_batt_prev = None
@@ -990,7 +996,11 @@ class Controller:
         self._run_done = {}
         self._mode_trade_was = False
         self._charge_blocked_q = None
+        self._charge_gap_q = None       # OPT-15: an unmeasured stop's quarter
         self._ref_cheap = None
+        # OPT-15: a run edge the loop holds at E: (E, step sign, until, the
+        # last battery reading).
+        self._edge = None
         # OPT-11 P4: the solar forecast and the day plan. Only with battery
         # modes on AND a forecast for today set; otherwise none of this runs
         # and every mode acts as in P3 option A. OPT-17: each day may name
@@ -1194,6 +1204,17 @@ class Controller:
         self.peak_fc = None
         self.cheap = False
         self._price_gated = False     # MAINT-13: is a price gate set up
+        # PRICE-01. Which step of the price chain the prices come from (logged
+        # once per change), the last series that was published (so a gap can say
+        # since when), and the gap itself: True while a refresh has finished and
+        # no published price covers now. The notification is raised once per
+        # gap and taken down when it ends.
+        self.price_watch = PriceWatch()
+        self._last_published = None
+        self.price_gap = False
+        self.price_gap_since = None
+        self._price_gap_announced = False
+        self._fixed_note_said = False
         self._gated_key = None        # MAINT-13: (options, hour) of the cache
         # TARIFF-03. One line of prose for the status page saying WHICH tariff
         # window we are in and why it is or is not cheap - so "Cheap window:
@@ -2216,10 +2237,15 @@ class Controller:
                     or maint_results[i].phase == IDLE)
             refused = (inv.refused if len(self.inverters) > 1
                        else self.batt_refused) or 0
+            # OPT-15: a charge refusal's probe (SAFETY-73, N>1) as it stood
+            # when last decided; its pin is filed after this, in cycle().
+            probing = (len(self.inverters) > 1 and refused < 0
+                       and inv.probe_from is not None)
             out.append(modetrade.Pack(
                 inv.name, pm.use, pm.mode, pm.sell and pm.can_sell,
                 float(inv.max_w), inv.soc, inv.capacity_kwh,
-                live=inv.name in live, idle=idle, refused=int(refused)))
+                live=inv.name in live, idle=idle, refused=int(refused),
+                probing=probing))
         return out
 
     def _price_runs(self, now, packs, floor_pct, ceiling_pct):
@@ -2377,9 +2403,17 @@ class Controller:
             done_charge=done_c, done_sell=done_s, targets=targets,
             draining=any(r.phase == DRAIN for r in maint_results or ()))
         # A charge the guard or the headroom stopped stays off this period.
-        if was and self.mode_tick.action != modetrade.CHARGE and \
-                self.mode_tick.why in ("peak", "headroom"):
-            self._charge_blocked_q = quarter
+        # OPT-15: only a MEASURED stop latches; the first unmeasured headroom
+        # (None) in a quarter stops this tick only, so a gap cannot cost the
+        # whole quarter. A second one latches, so gaps cannot flip the charge.
+        if was and self.mode_tick.action != modetrade.CHARGE:
+            why = self.mode_tick.why
+            gap = why == "headroom" and self.arb_headroom_w is None
+            if why == "peak" or (why == "headroom" and not gap) or (
+                    gap and self._charge_gap_q == quarter):
+                self._charge_blocked_q = quarter
+            elif gap:
+                self._charge_gap_q = quarter
         return self.mode_tick
 
     def _run_mark(self, kind, run, packs, out, extra=None) -> set:
@@ -2407,6 +2441,19 @@ class Controller:
         tick = self.mode_tick
         if tick is None:
             return False
+        if tick.action == modetrade.CHARGE:
+            # OPT-20: the ask carries PROBE_W for exactly the probes whose pin
+            # is filed this tick. `decide()` ran before the pin was (or the
+            # window closed since), so the two can differ by one cycle; left
+            # alone, the allocator takes the pin's watts out of another
+            # battery's share, or hands them to one it can reach.
+            pins = _ctl.PROBE_W * sum(
+                1 for c in claims if c.source == "refused"
+                and c.kind == "set" and c.value < 0)
+            if pins != tick.probe_w:
+                tick = self.mode_tick = dataclasses.replace(
+                    tick, ask_w=tick.ask_w + tick.probe_w - pins,
+                    probe_w=pins)
         size = modetrade.size(tick, self.loop_bound(claims)
                               if tick.action else None, self.arb_headroom_w)
         runs = self.mode_runs
@@ -2450,18 +2497,18 @@ class Controller:
                 else "trade_off"))
         return self.arb.action is not None
 
-    def _reseed_run_edge(self, claims) -> None:
+    def _reseed_run_edge(self, claims, now) -> None:
         """OPT-11 P3: a mode trade just ended, so the loop takes over from a
         command no loop chose. Start it at the house's own point E, the
         command that brings the grid to its target now (`site battery + grid
-        - target`, inside the loop bound), instead of at the trade's watts
-        (the trade began with the same unslewed step). This tick's error still
-        measures the trade's command (it is exactly E - battery), so the
-        integrator is seeded that much short and lands on E after its step.
-        Measured (tools/opt11p3_replay.py, lagged battery, 2.5 kW charge
-        ending under an 800 W house): no reseed -258 W export then a 2976 W
-        import, settled in 55 s; this -257 W / +615 W, settled in 20 s.
+        - target`, inside the loop bound), instead of at the trade's watts.
+        OPT-15: then HOLD it at E (`_edge_grid()`) until the meter shows the
+        step or `EDGE_HOLD_S` passes. The readings still describe the trade for
+        a second or two (meter and battery lag), and stepping on them sent
+        E 810 -> 1370 -> 1920 W on TEST-23: -1120 W export at a charge end.
+        Measured: DECISIONS/OPT-11-battery-modes.md.
         """
+        self._edge = None
         batt = self.site_batt_w
         if batt is None or self.grid is None:
             return
@@ -2470,8 +2517,34 @@ class Controller:
         if bound is not None:
             want = max(bound[0], min(bound[1], want))
         want = float(round(max(-self.site_max_w, min(self.site_max_w, want))))
-        self.target = want
-        self.i_w = want - self.tuning.gain * (want - float(batt))
+        self.target = self.i_w = want
+        if want != float(batt):
+            self._edge = (want, 1.0 if want > float(batt) else -1.0,
+                          now + timedelta(seconds=EDGE_HOLD_S), float(batt))
+
+    def _edge_grid(self, end, now):
+        """OPT-15: the grid reading the loop acts on this tick. While a run
+        edge is held, the target itself (no error, the command stays at E).
+        The hold ends when the meter reaches the target in the step's
+        direction (or passes it), on `end` (a trade started, or another claim
+        moved the command), or after `EDGE_HOLD_S` - later, up to twice that,
+        while the battery reading is still moving towards E."""
+        e = self._edge
+        if e is None:
+            return self.grid
+        held_w, sign, until, last_b = e
+        tg, db = self.tuning.target_grid_w, self.tuning.deadband_w
+        b = self.site_batt_w
+        moving = (b is not None and sign * (float(b) - last_b) >= db
+                  and sign * (held_w - float(b)) >= db
+                  and now < until + timedelta(seconds=EDGE_HOLD_S))
+        if (end or (now >= until and not moving)
+                or sign * (float(self.grid) - tg) < db):
+            self._edge = None
+            return self.grid
+        self._edge = (held_w, sign, until, last_b if b is None else float(b))
+        self.i_w = held_w
+        return tg
 
     def _charge_track(self, claims, maint_results) -> None:
         """SAFETY-93, N>=2: a charge ends when its battery leaves CHARGE or can
@@ -2730,6 +2803,43 @@ class Controller:
             out["sell"] = pm.sell
         return out
 
+    async def _maint_unit_action(self, what, unit, now) -> dict:
+        """MAINT-11: start or abort the maintenance cycle of ONE named battery.
+
+        Returns `{"error", "code", "unit"}` for a refusal and changes nothing.
+        The site keeps its one maintenance slot: a start while any battery
+        holds it is refused (no queue), see DECISIONS/MAINT-11. The phase
+        machine is not touched beyond `force_start()` and `abort()`, the same
+        two calls the bare button makes.
+        """
+        inv = next((i for i in self.inverters if i.name == unit), None)
+        if inv is None:
+            return self._maint_refusal("unit")
+        machine = self.maints[self.inverters.index(inv)]
+        if what == "maint_start":
+            holder = next((i for i, m in zip(self.inverters, self.maints)
+                           if m.phase in POWER_MOVING), None)
+            if holder is not None:
+                return self._maint_refusal("busy", holder.name)
+            if self.modes_on and not self.pack_mode(inv).use:
+                return self._maint_refusal("off", inv.name)
+            for msg in machine.force_start(now):
+                self.log_event(msg, hint=messages.hint(
+                    "maintenance", phase=machine.phase))
+            return {"unit": inv.name, "phase": machine.phase}
+        if machine.phase not in POWER_MOVING:
+            return self._maint_refusal("idle", inv.name)
+        for msg in machine.abort(now, "operator"):
+            self.log_event(msg, hint=messages.hint("maintenance",
+                                                   phase=machine.phase))
+        await self.command_site_zero()
+        return {"unit": inv.name, "phase": machine.phase}
+
+    @staticmethod
+    def _maint_refusal(code, unit="") -> dict:
+        return {"error": messages.maint_refused(code, unit), "code": code,
+                "unit": unit}
+
     def mode_values(self) -> dict:
         """OPT-11 P2: each battery's mode and switch, for their HA state
         topics. Read from the store, so they are right after a restart. Empty
@@ -3351,6 +3461,12 @@ class Controller:
             self.cheap = (now_p is not None and avg_p is not None and now_p <= avg_p)
             self._price_gated = True
             self.tariff_words = "Prices from Home Assistant entities"
+        elif uses_chain(o):
+            # PRICE-01. A provider with fallbacks gives the maintenance gate
+            # its own prices: the current 15-minute price against today's
+            # average, as the Home Assistant pair did. Still no I/O here - the
+            # series is the one the background refresh stored.
+            self._provider_gate(datetime.now(timezone.utc))
         else:
             # TARIFF-03. §9.2 makes a static day/night tariff a first-class
             # product, and its required EMS handling is TIME-WINDOW SHIFTING.
@@ -3914,6 +4030,38 @@ class Controller:
                            inv.refusal_note())]
                 if n]
 
+    def _provider_gate(self, now: datetime) -> None:
+        """PRICE-01: `cheap`, the gate and the gap from the standing plan.
+
+        The gate exists whenever the provider does: no price for now is a
+        closed gate, so the charge waits and does not run unpriced. The gap
+        flag stays False until the first refresh has finished, so a start-up
+        is not a gap.
+        """
+        plan = self.fresh_tariff_plan(now)
+        published = None if plan is None else plan.published
+        if published is not None:
+            self._last_published = published
+        gate = gate_for(published, now)
+        self.cheap, self._price_gated = gate.cheap, True
+        self.tariff_words = gate.words
+        # Owner, 2026-10-14: the words say 'maintenance waits', so they show
+        # only while the maintenance charge is on.
+        self.price_gap = ((not gate.covered) and self.tariff_at is not None
+                          and MaintConfig.from_options(self.o).enabled)
+        last = self._last_published
+        if gate.covered or last is None:
+            self.price_gap_since = None
+        elif last.covers(now):
+            # The last series still covers now, but no refresh has made it
+            # current for TARIFF_MAX_AGE_S: the refresh task has stopped. The
+            # gap began when the plan was retired.
+            self.price_gap_since = (
+                None if self.tariff_at is None
+                else self.tariff_at + timedelta(seconds=TARIFF_MAX_AGE_S))
+        else:
+            self.price_gap_since = last.last_end_before(now)
+
     def _static_gated(self, o: dict, now: datetime) -> bool:
         """`static_gated()`, worked out once an hour: it builds the same
         month-long plan as `static_status()` (about 20 ms with a profile), and
@@ -4558,8 +4706,16 @@ class Controller:
         # is not measured on that path, and the honest report is NOT COVERED -
         # the same answer, for the same reason, that the status page already
         # gives for SAFETY-18 on a transport that cannot see `unchanged_s`.
+        # OPT-15: with battery modes on, the quarter `now` is in, even before
+        # its first sample (DECISIONS/OPT-11-battery-modes.md).
         self._peak_proj = (None if not self.p1_enabled
-                           else self.peak.project(self.p1.averager, now))
+                           else self.peak.project(self.p1.averager, now,
+                                                  roll=self.modes_on))
+        # OPT-15 x SAFETY-81: see `check_peak_saturated()`.
+        self._peak_rolled = (self._peak_proj is not None
+                             and self._peak_proj.block_start is not None
+                             and self._peak_proj.block_start
+                             != self.p1.averager.block_start)
         _reading = self.peak.peak(now) if self.p1_enabled else None
         # SAFETY-90: seconds a meter gap left uncounted are counted, so the
         # guard goes on after the readings return.
@@ -5002,11 +5158,15 @@ class Controller:
             # entering failsafe re-seeds the integrator to zero and the first
             # cycle after release starts from zero instead of dumping the whole
             # stale period as power.
-            if self.loop_w is None or self.target != self.loop_w:
+            moved = self.loop_w is None or self.target != self.loop_w
+            if moved:
                 self.i_w = self.target
-            # OPT-11 P3: a run edge (a mode trade ended) reseeds the loop.
+            # OPT-11 P3: a run edge (a mode trade ended) reseeds the loop, and
+            # OPT-15 holds it there until the meter shows the step.
             if trade_was and not mode_trade:
-                self._reseed_run_edge(claims)
+                self._reseed_run_edge(claims, now)
+                moved = False
+            loop_grid = self._edge_grid(mode_trade or moved, now)
             # SAFETY-52: another writer overrode the loop, so a refusal learned
             # against the loop's own ask may no longer describe the wire. A gap
             # (`loop_w` None: blind or stopped) keeps it: the stale-reading stop
@@ -5059,8 +5219,10 @@ class Controller:
             decision = compute(
                 prev_w=loop_prev,
                 # SAFETY-95: a drain's tail is not the loop's to chase.
+                # OPT-15: `loop_grid` is the grid, or the target while a run
+                # edge is held.
                 grid_w=(self._drain_grid_w(_live96) if self._drain_tail
-                        else self.grid),
+                        else loop_grid),
                 actual_w=site_batt,
                 tuning=self.tuning,
                 sat_count=self.sat_count,
@@ -5438,6 +5600,12 @@ class Controller:
         # is not, and test_freeze.py part 5 fails on exactly that.
         await self.check_meter_frozen()
 
+        # --- PRICE-01: no price for now, said once and taken down once --------
+        # Not a safety check, so it is one of the cheap ones: an attribute test
+        # and, on a change only, one Home Assistant call.
+        await self.check_price_gap()
+        await self.check_fixed_note()
+
         # --- SAFETY-31's alarm, and its boundary is the LATCH, not a number ---
         # Unconstrained where the two above are not: it grades
         # `self.circ_wd.tripped`, which was advanced near the top of this method
@@ -5807,9 +5975,13 @@ class Controller:
         if prev is not None:
             batt = min(float(batt), float(prev))
         p = self._peak_proj
+        # OPT-15 x SAFETY-81: until the new quarter's first sample the old
+        # projection read "no seconds left" (not high), which restarted the
+        # hold; a rolled one (battery modes on) is not graded then, so a
+        # persistent overload is still notified once per quarter.
         high = bool(
             g is not None and g.saturated and p is not None
-            and p.block_start is not None
+            and p.block_start is not None and not self._peak_rolled
             and peakguard.load_too_high(
                 p, batt_w=batt, ceiling_w=g.ceiling_w,
                 achievable_w=self.site_rating_w))
@@ -6050,6 +6222,50 @@ class Controller:
             await self.hass.call("persistent_notification", "create",
                                  messages.not_delivering(inv.name, slug).data())
 
+    async def check_price_gap(self) -> None:
+        """PRICE-01. One notification when no price covers now, gone when one does.
+
+        `price_gap` is worked out on the tick from the stored plan. A gap
+        raises the notification once: the flag is set BEFORE the await, for
+        `check_circulating()`'s reason (a Home Assistant call can raise or
+        hang, and a retry every cycle would be a storm). When the gap ends the
+        same notification is taken down. Control is not touched either way: the
+        maintenance charge waits because its gate is shut (`_provider_gate`),
+        and nothing here decides that.
+        """
+        if self.price_gap and not self._price_gap_announced:
+            self._price_gap_announced = True
+            await self.hass.call("persistent_notification", "create",
+                                 messages.no_prices(*self._gap_args()).data())
+        elif not self.price_gap and self._price_gap_announced:
+            self._price_gap_announced = False
+            await self.hass.call("persistent_notification", "dismiss",
+                                 messages.prices_back().data())
+
+    async def check_fixed_note(self) -> None:
+        """PRICE-01 G1. At the first cycle only: one INFO line when a
+        `static_profile` is set beside `price_service` (it is the plan's last
+        fallback, not a fault, so no notification), and a dismiss of the card an
+        earlier build raised, which is harmless when absent."""
+        if self._fixed_note_said:
+            return
+        self._fixed_note_said = True
+        if fixed_tariff_beside_service(self.o):
+            _LOG.info(messages.FIXED_TARIFF_LOG)
+        try:
+            await self.hass.call("persistent_notification", "dismiss",
+                                 messages.fixed_tariff_card_gone().data())
+        except Exception:  # noqa: BLE001 - housekeeping never stops a cycle
+            _LOG.debug("Could not take down the old fixed-tariff card.")
+
+    def _gap_args(self) -> tuple:
+        """`(since, now)` in Brussels time for the gap's words. `since` is None
+        when no price was ever published."""
+        now = brussels(datetime.now(timezone.utc))
+        if self.price_gap_since is None:
+            return None, now
+        return brussels(self.price_gap_since), now
+
     async def check_meter_frozen(self) -> None:
         """SAFETY-18. Alarm on a meter that answers forever without changing.
 
@@ -6184,7 +6400,7 @@ class Controller:
             try:
                 plan = await resolve_tariff(
                     self.o, now, now + timedelta(hours=horizon), now=now,
-                    history=self.price_history)
+                    history=self.price_history, watch=self.price_watch)
                 standing = self.fresh_tariff_plan(now)
                 # Three terms, and each of them is the only false one in some
                 # check: the feed answered (replace), nothing current stands
@@ -7261,6 +7477,9 @@ class Controller:
             ("Maintenance due", "now" if next_due is None else next_due.strftime("%Y-%m-%d")),
             ("Cheap window", "yes" if self.cheap else "no"),
             ("Tariff", self.tariff_words),
+            # PRICE-01: only while no price covers now.
+            *((("Prices", messages.row_no_prices(*self._gap_args())),)
+              if self.price_gap else ()),
             # FCST-04. WHAT §8.3 HAS TO CARRY FORWARD, which is the difference
             # between a 48-hour plan and a 12-hour one on a weekday morning.
             # It is its own row rather than a clause of "Tariff" because it
@@ -7448,6 +7667,10 @@ class Controller:
                 # would read as the stop button not working.
                 await self.command_site_zero()
             return {"auto": self.auto}
+        if what in ("maint_start", "maint_abort") and unit is not None:
+            # MAINT-11: the operator named the battery. A request with no unit
+            # falls through to the branches below, unchanged.
+            return await self._maint_unit_action(what, unit, now)
         if what == "maint_start":
             # ⚠️ WHICH PACK, BECAUSE THERE ARE NOW SEVERAL AND THE BUTTON HAS
             # ONE LABEL. `_maint_button()` answers it: the pack that holds the
@@ -7458,10 +7681,8 @@ class Controller:
             # picked on its own. At N=1 both branches are `maints[0]` and this
             # is the shipped call, byte for byte.
             #
-            # A PER-PACK BUTTON IS A UI CARD, NOT THIS ONE. `web.py` posts a
-            # bare `maint_start` with no unit, and inventing a unit parameter
-            # here would ship half a surface: the page would still have one
-            # button and the API would have two meanings.
+            # This is the bare request (no unit). A request naming a battery
+            # was handled above by `_maint_unit_action()` (MAINT-11).
             _m = self._maint_button(now)
             for msg in _m.force_start(now):
                 self.log_event(msg, hint=messages.hint("maintenance",

goodwe_controller/app/messages.py

@@ -129,6 +129,8 @@ S_NOT_DELIVERING = "An inverter is not delivering"
 T_METER_FROZEN = "Meter reading may be stuck"
 T_MAINT_FAILED = "Battery cycle did not finish"
 T_MAINT_FAILED_NL = "Batterijcyclus niet afgerond"
+T_NO_PRICES = "No prices"
+T_NO_PRICES_NL = "Prijzen ontbreken"
 
 ID_LOOP_BOUND = "goodwe_integrator_bound"
 ID_OUTPUT_CLAMP = "goodwe_output_clamp"
@@ -138,6 +140,10 @@ ID_CIRCULATING = "goodwe_circulating_power"
 ID_NOT_DELIVERING = "goodwe_not_delivering_{slug}"
 ID_METER_FROZEN = "goodwe_meter_frozen"
 ID_MAINT_FAILED = "goodwe_maint_failed_{slug}"
+ID_NO_PRICES = "goodwe_no_prices"
+# PRICE-01: an earlier build raised a card with this id. Nothing raises it now;
+# the add-on only dismisses it at start.
+OLD_FIXED_CARD_ID = "goodwe_fixed_tariff_unused"
 
 # Which limit cut a command (clamp.ClampResult.bound, plus the loop's own).
 # The setting is named by its label, "Inverter rating (W)".
@@ -314,6 +320,77 @@ def maint_failed(kind: str, days: int, unit: str = "", slug: str = "") -> Notice
                   T_MAINT_FAILED, en, body_nl=f"{T_MAINT_FAILED_NL}. {nl}")
 
 
+NL_MONTHS = ("jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep",
+             "okt", "nov", "dec")
+
+
+def since_text(since, now, lang="en") -> str:
+    """`00:00` for a moment today, `13 Oct at 21:00` (`13 okt om 21:00` in
+    Dutch) for an earlier day. Both arguments are already in the site's zone.
+    Empty for no moment."""
+    if since is None:
+        return ""
+    if since.date() == now.date():
+        return f"{since:%H:%M}"
+    if lang == "nl":
+        return f"{since.day} {NL_MONTHS[since.month - 1]} om {since:%H:%M}"
+    return when(since)
+
+
+def no_prices(since=None, now=None) -> Notice:
+    """PRICE-01: no source has a price for now. Said once, gone with the gap.
+    `since` is the moment the last price ran out, or None."""
+    if since is not None:
+        en = (f"No prices since {since_text(since, now)}, so the monthly "
+              f"battery cycle waits until they return.")
+        nl = (f"Sinds {since_text(since, now, 'nl')} zijn er geen prijzen, dus "
+              f"de maandelijkse batterijcyclus wacht tot ze terug zijn.")
+    else:
+        en = ("No prices have come in yet, so the monthly battery cycle waits "
+              "until they do.")
+        nl = ("Er zijn nog geen prijzen binnen, dus de maandelijkse "
+              "batterijcyclus wacht tot ze er zijn.")
+    return Notice(ID_NO_PRICES, WARNING, T_NO_PRICES, en,
+                  body_nl=f"{T_NO_PRICES_NL}. {nl}")
+
+
+@dataclass(frozen=True)
+class Dismiss:
+    """The payload that takes one notification down again."""
+    id: str
+
+    def data(self) -> dict:
+        return {"notification_id": self.id}
+
+
+def prices_back() -> Dismiss:
+    """PRICE-01: the 'No prices' notification, taken down when a price is back."""
+    return Dismiss(ID_NO_PRICES)
+
+
+# PRICE-01: a fixed tariff beside the price service. One true sentence, for the
+# start-up log (English only, as every log line) and the settings page (EN, NL).
+FIXED_TARIFF_LOG = "Fixed tariff is only used if no prices are available."
+FIXED_TARIFF_NOTE = ("With the price service, the fixed tariff is only used if "
+                     "no prices are available.")
+FIXED_TARIFF_NOTE_NL = ("Met de prijsdienst wordt het vaste tarief alleen "
+                        "gebruikt als er geen prijzen zijn.")
+# Settings-page notes that have a Dutch twin (uipage.anchors).
+NOTE_NL = {FIXED_TARIFF_NOTE: FIXED_TARIFF_NOTE_NL}
+
+
+def fixed_tariff_card_gone() -> Dismiss:
+    """PRICE-01: takes down the card an earlier build raised."""
+    return Dismiss(OLD_FIXED_CARD_ID)
+
+
+def row_no_prices(since=None, now=None) -> str:
+    """PRICE-01: the status row while no price covers now."""
+    if since is not None:
+        return f"No prices since {since_text(since, now)}, maintenance waits."
+    return "No prices yet, maintenance waits."
+
+
 def row_maint_waits(until_text: str) -> str:
     """MAINT-13: the status row while a failed cycle waits."""
     return f"Waits until {until_text} after a cycle that did not finish."
@@ -1022,6 +1099,21 @@ def pack_refused(why: str) -> str:
     return PACK_REFUSED[why]
 
 
+# MAINT-11: why a start or stop of ONE battery's cycle was refused. `{unit}` is
+# the battery the sentence is about (for "busy", the one that is cycling). The
+# page shows the same sentences in Dutch from app/ui_text, keyed by the code.
+MAINT_REFUSED = {
+    "unit": "There is no battery with that name.",
+    "busy": "Only one battery can cycle at a time, and {unit} is cycling now.",
+    "off": "{unit} is switched off, so it cannot start a cycle.",
+    "idle": "{unit} is not running a cycle.",
+}
+
+
+def maint_refused(why: str, unit: str = "") -> str:
+    return MAINT_REFUSED[why].format(unit=unit)
+
+
 def hint(key: str, **kw) -> str:
     """The plain words for one event. `w` is formatted as watts, `sw` as
     watts with their sign (positive gives power, negative charges)."""
@@ -1043,6 +1135,11 @@ def hint_samples() -> list:
 RED, AMBER, GREEN = "bad", "warn", "ok"
 
 
+# PRICE-01 samples: a gap that began today, and one that began the day before.
+_SINCE_SAMPLE = (datetime(2026, 10, 14, 0, 0), datetime(2026, 10, 14, 9, 0))
+_SINCE_OLDER = (datetime(2026, 10, 13, 21, 0), datetime(2026, 10, 14, 9, 0))
+
+
 def status_samples() -> list:
     """`(function name, colour, text)` for every row and banner, for the test.
 
@@ -1171,6 +1268,9 @@ def status_samples() -> list:
                                                            True)),
         ("row_circulating_check", GREEN, row_circulating_check(0, 0, 60)),
         ("row_maint_waits", AMBER, row_maint_waits("2026-10-13")),
+        ("row_no_prices", AMBER, row_no_prices(*_SINCE_SAMPLE)),
+        ("row_no_prices", AMBER, row_no_prices(*_SINCE_OLDER)),
+        ("row_no_prices", AMBER, row_no_prices()),
     ]
 
 
@@ -1203,6 +1303,9 @@ def samples() -> list:
         meter_frozen(90),
         maint_failed("charge", 7),
         maint_failed("drain", 7, "inverter-b", "inverter_b"),
+        no_prices(*_SINCE_SAMPLE),
+        no_prices(*_SINCE_OLDER),
+        no_prices(),
     ]
 
 
@@ -1235,6 +1338,7 @@ LABELS = {
     "price_formula": "Your own tariff formula",
     "price_export_formula": "Your own injection formula",
     "price_csv_path": "Price CSV file",
+    "price_service_token": "Price service token",
     "price_now_entity": "Current price entity",
     "price_avg_entity": "Average price entity",
     "arbitrage_enabled": "Trade on the price spread",

goodwe_controller/app/modetrade.py

@@ -21,7 +21,7 @@ Roles (the page's Why line names them):
            grid the others cannot give power either; the allocator never
            splits a target both ways).
 
-Rules that keep this safe (tests: test_modes_p3.py):
+Rules that keep this safe (tests: test_modes_p3.py, test_price_run_fixes.py):
   * every range holds 0 W (a mode may forbid a direction, never force one);
   * a Solar first battery never charges from the grid;
   * P4: with a day plan (`targets`), a Leftover solar battery charges from
@@ -31,11 +31,11 @@ Rules that keep this safe (tests: test_modes_p3.py):
   * grid charging needs a measured peak guard that is clear and a measured
     headroom (SAFETY-45); the trade is sized to that headroom, whose aim is
     `peak_cap_w - peak_margin_w` (SAFETY-79). It starts only at START_W or
-    more, and once the guard or the headroom stops it, it stays stopped for
-    the rest of that 15-minute period (`blocked`): a charge makes the other
-    batteries stop giving power, so a few watts of charge flipping on and
-    off would swing the house between them and the grid (measured on the
-    2026-09-09 replay: 13 flips in 4 minutes at a 3.5 kW house);
+    more, and once the guard or a measured headroom stops it, it stays
+    stopped for the rest of that 15-minute period (`blocked`): a charge
+    makes the other batteries stop giving power, so a few watts of charge
+    flipping on and off would swing the house between them and the grid
+    (measured on the 2026-09-09 replay: 13 flips in 4 minutes at 3.5 kW);
   * selling needs selling on for that battery, the sell run, a price >= 0
     now, and the battery above `arbitrage_soc_floor`; it stops there. The
     peak guard never stops a sell (section 9.1: discharge is never capped);
@@ -43,13 +43,21 @@ Rules that keep this safe (tests: test_modes_p3.py):
   * a battery out of a run (full, or at the floor) stays out until the run
     ends, so the ceiling and the floor do not re-arm within one run;
   * a battery that refuses a direction (SAFETY-52/73) takes no part in a
-    run in that direction: the refusal wins over the run;
+    run in that direction: the refusal wins over the run. The one exception
+    is its SAFETY-73 probe inside a cheap run (OPT-15): it is a charger then,
+    pinned at PROBE_W by its own claim, so the others rest (one sign) and the
+    card's "tries again every 15 minutes" holds in the run too;
+  * OPT-20: a probe asks PROBE_W for the probing battery and nothing more.
+    The rest of the ask is what the other chargers would have had without
+    the probe (none: PROBE_W alone), so a probe never places charge on a
+    battery in a maintenance phase or on one that rests;
   * no grid charge while another battery drains for its monthly cycle
     (`draining`, SAFETY-78): it would charge against the drain.
 """
 
 from dataclasses import dataclass
 
+from .control import PROBE_W
 from .packmode import (CHEAP_HOURS, GRID_CHARGE_MODES, LEFTOVER_SOLAR,
                        PLAN_CHARGE_MODES, SOLAR_FIRST)
 
@@ -75,6 +83,7 @@ class Pack:
     live: bool = True
     idle: bool = True           # not in a maintenance phase
     refused: int = 0            # SAFETY-52/73: +1 refuses to give, -1 to charge
+    probing: bool = False       # OPT-15: its SAFETY-73 probe window is open
 
 
 @dataclass(frozen=True)
@@ -84,6 +93,7 @@ class Tick:
     action: str | None          # "charge" | "sell" | None
     ask_w: float                # signed site ask before sizing (0 if none)
     why: str | None             # why no trade when a run is on, else None
+    probe_w: float = 0.0        # OPT-20: the part of `ask_w` that is a probe
 
 
 def _room_kwh(p: Pack, pct: float) -> float:
@@ -112,15 +122,18 @@ def charge_to(p: Pack, ceiling_pct, targets=None):
     return None if t is None else min(float(ceiling_pct), float(t))
 
 
-def chargers(packs, ceiling_pct, done=(), targets=None) -> list:
+def chargers(packs, ceiling_pct, done=(), targets=None, probe=False) -> list:
     """Batteries that may charge from the grid in a cheap run: below the
-    level `charge_to()` allows them (P4: the day plan's)."""
+    level `charge_to()` allows them (P4: the day plan's). With `probe`, also
+    one refusing to charge while its SAFETY-73 probe is open: its own P_SAFETY
+    pin keeps it at PROBE_W (OPT-15)."""
     out = []
     for p in packs:
         to = charge_to(p, ceiling_pct, targets)
         if (to is not None and p.use and p.idle and p.live
                 and p.soc is not None and p.soc < to
-                and p.refused >= 0 and p.name not in done):
+                and (p.refused >= 0 or (probe and p.probing))
+                and p.name not in done):
             out.append(p)
     return out
 
@@ -172,8 +185,8 @@ def decide(runs, now, packs, *, charge_ok, sell_ok, trade_why, price_now,
     in_sell = plan_on and runs.sell is not None and runs.sell.holds(now)
 
     why = None
-    ch = chargers(packs, ceiling_pct, done_charge, targets) if in_cheap \
-        else []
+    ch = chargers(packs, ceiling_pct, done_charge, targets, probe=True) \
+        if in_cheap else []
     if ch and draining:
         ch, why = [], "cycle"
     charging = False
@@ -225,8 +238,12 @@ def decide(runs, now, packs, *, charge_ok, sell_ok, trade_why, price_now,
             ranges[p.name] = (lo, hi)
 
     if charging:
-        ask = -sum(abs(p.rating_w) for p in ch)
-        return Tick(ranges, roles, CHARGE, ask, None)
+        # OPT-20: a probing refuser is asked PROBE_W (its own pin holds it
+        # there); only the batteries that charge without a probe are asked
+        # for their rating.
+        probe_w = PROBE_W * sum(1 for p in ch if p.refused < 0)
+        ask = -sum(abs(p.rating_w) for p in ch if p.refused >= 0) - probe_w
+        return Tick(ranges, roles, CHARGE, ask, None, probe_w)
     if selling:
         ask = sum(abs(p.rating_w) for p in se) + max(0.0, float(house_w))
         return Tick(ranges, roles, SELL, ask, None)
@@ -243,8 +260,20 @@ def size(tick: Tick, bound, headroom_w) -> float:
         return 0.0
     lo, hi = bound
     if tick.action == CHARGE:
-        cap = min(-float(tick.ask_w), -float(lo),
-                  float(headroom_w) if headroom_w is not None else 0.0)
+        room = float(headroom_w) if headroom_w is not None else 0.0
+        pw = float(tick.probe_w)
+        if pw > 0.0:
+            # OPT-20: the others' share is sized as without the probe; the
+            # probe's PROBE_W is added on top (the grid rises by PROBE_W at
+            # most), and alone it is sized by the bound and the headroom.
+            rest = max(0.0, min(-float(tick.ask_w) - pw, -float(lo) - pw,
+                                room))
+            if rest > 0.0:
+                return -(rest + pw)
+            # PROBE_W exactly or no trade: less would void the pin and hand
+            # the remainder to whichever battery the allocator can reach.
+            return -pw if min(-float(lo), room) >= pw else 0.0
+        cap = min(-float(tick.ask_w), -float(lo), room)
         return -max(0.0, cap)
     return max(0.0, min(float(tick.ask_w), float(hi)))
 

goodwe_controller/app/p1.py

@@ -312,6 +312,12 @@ class QuarterAverager:
         """
         return self._last_net
 
+    @property
+    def held_t(self) -> float | None:
+        """Epoch seconds of the held sample. OPT-15: `PeakTracker.project()`
+        with `roll=True` credits it into the next block as `add()` will."""
+        return self._last_t
+
     @property
     def held_since(self) -> datetime | None:
         """SAFETY-90: when the held sample arrived (its `ingest_ts`), or None."""

goodwe_controller/app/price.py

@@ -750,6 +750,18 @@ class _Series(PriceRead):
         except Absence:
             return False
 
+    def last_end_before(self, instant: datetime):
+        """When the last price that has run out by `instant` stopped covering,
+        or None if no price has (PRICE-01: "no prices since 00:00").
+
+        Each point's end is the one `_cover_table()` worked out, so a hole in
+        the series is reported from where the hole starts and not from the end
+        of the day.
+        """
+        u = instant.astimezone(timezone.utc)
+        ends = [end for _start, end, _p in self._cover if end <= u]
+        return max(ends) if ends else None
+
     def window(self, since: datetime, until: datetime) -> tuple:
         """Points whose START falls in [since, until). May legitimately be empty.
 
@@ -906,6 +918,10 @@ PRICE_OPTION_DEFAULTS = {
     "export_price_eur_kwh": 0.04,      # §14 tariffs.export_price_eur_kwh (AC4)
     "price_csv_path": "/share/goodwe_prices.csv",
     "price_feed_url": "",
+    # PRICE-01. The bearer token of the owner's price server. A secret: it is
+    # in SECRET_OPTIONS below, so no text built from an error reaches a log,
+    # the status page or a notification with it in.
+    "price_service_token": "",
     "price_horizon_h": 48,
     "price_timeout_s": 10,
     # TARIFF-03. §14 `tariffs.static_profile: null`. A JSON object describing a
@@ -992,6 +1008,26 @@ FRAMEWORK_KEYS = frozenset({
 })
 
 
+# PRICE-01. Options whose VALUE must never be printed. `scrub()` removes them
+# from any text the price code builds out of an error.
+SECRET_OPTIONS = frozenset({"price_service_token"})
+
+
+def scrub(text, opts) -> str:
+    """`text` with every secret option's value replaced by `***`.
+
+    The price code builds reasons out of library errors, and a library may put
+    a request header into its error text. Taking the value out here is the
+    last line of defence; the plugin also never puts it in a message itself.
+    """
+    out = str(text)
+    for key in SECRET_OPTIONS:
+        secret = str((opts or {}).get(key) or "").strip()
+        if len(secret) >= 4:
+            out = out.replace(secret, "***")
+    return out
+
+
 class PluginOptions:
     """The options dict, minus the keys only the framework may read.
 
@@ -1216,6 +1252,13 @@ class PriceProvider(ABC):
 
     id = "?"
 
+    # PRICE-01. The ids to try, in order, when this source cannot answer, and
+    # whether the last answer is kept for a day without any source. Empty and
+    # False for every plugin that existed before, which is what keeps them
+    # exactly as they were: `price_chain.py` is not used for them at all.
+    FALLBACKS: tuple = ()
+    KEEPS_LAST_GOOD: bool = False
+
     @classmethod
     @abstractmethod
     def capabilities(cls) -> ProviderCapabilities:
@@ -1533,19 +1576,58 @@ def assemble(caps: ProviderCapabilities, raw, markup: float,
 # Transport - one place, HTTPS only, host checked against the declaration
 # --------------------------------------------------------------------------- #
 
-async def https_get(url: str, timeout_s: float) -> bytes:
+async def https_get(url: str, timeout_s: float, headers=None) -> bytes:
     """The default transport. §16: outbound is allow-listed and TLS'd.
 
     Imported lazily so `manual_csv` - the offline fallback - never needs aiohttp
     to be importable at all. AC3 says it works fully offline; that includes a
     machine where the HTTP stack is missing.
+
+    PRICE-01. `headers` is None for every plugin but `price_service`, and with
+    None this is the code it has always been, byte for byte. With headers it
+    answers in the SAFE words of `status_words()` and never lets a library
+    error through: an error from a request that carried a token is the one
+    place a token could be printed by somebody else's code.
     """
     import aiohttp
     t = aiohttp.ClientTimeout(total=float(timeout_s))
-    async with aiohttp.ClientSession(timeout=t) as s:
-        async with s.get(url) as r:
-            r.raise_for_status()
-            return await r.read()
+    if headers is None:
+        async with aiohttp.ClientSession(timeout=t) as s:
+            async with s.get(url) as r:
+                r.raise_for_status()
+                return await r.read()
+    try:
+        async with aiohttp.ClientSession(timeout=t) as s:
+            # No redirects: the host is fixed in code, and a redirect would
+            # take the request (and the token) somewhere the allow-list never
+            # saw. A 3xx is reported like any other status.
+            async with s.get(url, headers=headers,
+                             allow_redirects=False) as r:
+                if r.status != 200:
+                    raise SourceUnavailable(status_words(r.status))
+                return await r.read()
+    except SourceUnavailable:
+        raise
+    except Exception as e:                                    # noqa: BLE001
+        raise SourceUnavailable(
+            f"the price service did not answer ({type(e).__name__})")
+
+
+# PRICE-01. The one phrase a refused token is reported with. The fallback chain
+# reads it to tell "the owner must act" from "the server is down", so it is a
+# constant both sides import.
+AUTH_REFUSED = "the price service refused the token"
+
+
+def status_words(status: int) -> str:
+    """What an HTTP status from the price service is called. No header text."""
+    if status in (401, 403):
+        return f"{AUTH_REFUSED} ({status})"
+    if status == 429:
+        return "the price service says too many requests (429)"
+    if status >= 500:
+        return f"the price service has an error ({status})"
+    return f"the price service answered {status}"
 
 
 def check_egress(url: str, caps: ProviderCapabilities) -> str:
@@ -1870,6 +1952,91 @@ class GenericDayAhead(PriceProvider):
                                           provisional_default=False)
 
 
+@register
+class PriceService(PriceProvider):
+    """The owner's own price server (PRICE-01), COLUMNAR, in EUR/MWh.
+
+    SOURCES: energy
+    The framework ADDS: markup, taxes
+
+    The server answers the energy-charts layout (`unix_seconds`, `price`,
+    `unit`) plus `covers`, the complete Brussels days it holds. The price is
+    the wholesale energy price and nothing else, so markup and taxes are added
+    by the framework exactly as for `generic_dayahead`.
+
+    The host is fixed here, HTTPS only, and a bearer token (the option
+    `price_service_token`) goes in the `Authorization` header. The token is not
+    put into any message this class builds.
+
+    `FALLBACKS` names the next source down. `app/price_chain.py` walks it and
+    then the stored prices; this class only fetches.
+    """
+
+    id = "price_service"
+
+    HOST = "prices.kammenstraatha.duckdns.org"
+    URL = "https://prices.kammenstraatha.duckdns.org/v1/dayahead/BE"
+    FALLBACKS = ("generic_dayahead",)
+    KEEPS_LAST_GOOD = True
+
+    @classmethod
+    def capabilities(cls):
+        return ProviderCapabilities(
+            product=PriceProduct.DAY_AHEAD,
+            sources=frozenset({Component.ENERGY}),
+            egress_hosts=(cls.HOST,))
+
+    async def fetch(self, opts, since, until, transport):
+        token = str(opts.get("price_service_token") or "").strip()
+        if not token:
+            raise SourceUnavailable("no token is set for the price service")
+        if any(c.isspace() or not c.isprintable() for c in token):
+            raise SourceUnavailable(
+                "the price service token has a space or a line break in it")
+        check_egress(self.URL, self.capabilities())
+        try:
+            body = await transport(
+                self.URL, float(opts.get("price_timeout_s")),
+                headers={"Authorization": "Bearer " + token})
+        except SourceUnavailable:
+            raise
+        except Exception as e:                                # noqa: BLE001
+            raise SourceUnavailable(
+                f"the price service did not answer ({type(e).__name__})")
+        points = _points_from_columnar_json(body, expect_unit="EUR / MWh",
+                                            scale=0.001,
+                                            provisional_default=False)
+        covers = _covered_days(body)
+        if covers is None:
+            return points
+        whole = [p for p in points
+                 if brussels(p.start).date().isoformat() in covers]
+        if not whole:
+            raise SourceUnavailable(
+                "the price service sent no complete day")
+        return whole
+
+
+def _covered_days(body):
+    """The `covers` list of a price service answer as a set, or None if absent.
+
+    A day the server does not list as complete is not used: an hour missing
+    inside a day is a hole, and a hole is not a free hour.
+    """
+    try:
+        text = body.decode("utf-8") if isinstance(body, (bytes, bytearray)) \
+            else str(body)
+        covers = json.loads(text).get("covers")
+    except (ValueError, UnicodeDecodeError, AttributeError):
+        return None
+    if covers is None:
+        return None
+    if not isinstance(covers, list) or \
+            not all(isinstance(d, str) for d in covers):
+        raise SourceUnavailable("the price service sent a bad list of days")
+    return set(covers)
+
+
 @register
 class ManualCsv(PriceProvider):
     """A file on disk. AC3: the documented fallback, fully offline.
@@ -2169,9 +2336,10 @@ async def load_prices(opts: dict, since: datetime, until: datetime,
     except FrameworkOption:
         raise                       # a plugin bug, not a site condition
     except SourceUnavailable as e:
-        return PriceRead.no_data(f"{pid}: {e}")
+        return PriceRead.no_data(scrub(f"{pid}: {e}", opts))
     except Exception as e:          # noqa: BLE001 - see the docstring
-        return PriceRead.no_data(f"{pid}: {type(e).__name__}: {e}")
+        return PriceRead.no_data(
+            scrub(f"{pid}: {type(e).__name__}: {e}", opts))
 
     _emit_startup_preview(plugin, pid, points)
     return PriceRead.series(points, caps.product, pid,

goodwe_controller/app/price_chain.py

@@ -0,0 +1,228 @@
+"""PRICE-01 - where the prices come from when the first source does not answer.
+
+A provider that names `FALLBACKS` (app/price.py) is read through this module
+instead of straight from `load_prices()`. The order is fixed:
+
+    1. the provider itself (the owner's price server)
+    2. each id in its `FALLBACKS` (energy-charts.info)
+    3. the prices the history store kept from the last fetch that worked
+
+A step counts only if its answer holds a price for NOW. A server that answers
+200 with yesterday's prices is as useless to a battery as one that is down, so
+it is skipped, with the same log line.
+
+Every other provider never comes here (`uses_chain()` is False for it), so
+`generic_dayahead`, `manual_csv`, `custom_formula` and `off` take the road they
+always took.
+
+THE GATE. `gate_for()` is the maintenance charge rule for a site on such a
+provider: the current 15-minute price is at or below today's average. It is the
+rule the Home Assistant pair (`price_now_entity`, `price_avg_entity`) gave, read
+from the provider's own prices, so moving a site from the pair to the provider
+does not change WHEN the charge runs. DECISIONS/PRICE-01-own-price-server.md
+says how equal, and where it is not.
+"""
+
+import logging
+from dataclasses import dataclass
+from datetime import datetime
+
+from .price import (AUTH_REFUSED, PROVIDERS, PriceRead, brussels,
+                    price_option, provider_id, scrub)
+
+_LOG = logging.getLogger("goodwe.price.chain")
+
+# The four places a plan can come from, best first. A higher number is further
+# down the chain.
+STEP_OWN, STEP_PUBLIC, STEP_STORED, STEP_NONE = 0, 1, 2, 3
+
+# What a step is called in a status line.
+SOURCE_WORDS = {
+    "price_service": "the price service",
+    "generic_dayahead": "energy-charts",
+    "price_history": "saved prices",
+}
+
+
+def uses_chain(opts: dict) -> bool:
+    """Does the selected provider ask for the fallback chain?"""
+    cls = PROVIDERS.get(provider_id(opts))
+    return bool(cls is not None and (cls.FALLBACKS or cls.KEEPS_LAST_GOOD))
+
+
+def fixed_tariff_beside_service(opts: dict) -> bool:
+    """PRICE-01: a fixed tariff is set beside `price_service`. Not a fault: it
+    stays the plan's last fallback (`resolve_tariff`), and only the cheap window
+    and the gate ignore it. A blank or whitespace-only value is not set."""
+    return (provider_id(opts) == "price_service"
+            and bool(str(price_option(opts, "static_profile")).strip()))
+
+
+@dataclass(frozen=True)
+class Resolved:
+    """What the chain found. `published` is the series BEFORE the yesterday
+    fill and the window, which is what the day's average has to be read from:
+    the plan itself starts at the current hour."""
+
+    read: PriceRead
+    step: int
+    reasons: tuple = ()
+
+    @property
+    def published(self):
+        return self.read.match(series=lambda r: r, no_data=lambda _r: None)
+
+
+class PriceWatch:
+    """Which step the prices come from, and one log line per change of it.
+
+    The line is written when the step CHANGES and not before. Nothing repeats
+    while a source stays down, and nothing is written for a refresh that
+    changes nothing. The reasons (a status code, a timeout) go on a DEBUG line
+    beside it, with the token taken out.
+    """
+
+    def __init__(self):
+        self.step = None
+        self.auth_refused = False
+
+    def note(self, step: int, reasons=(), opts=None) -> None:
+        old, self.step = self.step, step
+        self.auth_refused = any(AUTH_REFUSED in r for r in reasons)
+        if old == step:
+            return
+        if reasons:
+            _LOG.debug("Price sources said: %s.",
+                       scrub("; ".join(reasons), opts))
+        if step == STEP_OWN:
+            if old is None:
+                _LOG.info("Prices come from the price service.")
+            else:
+                _LOG.info("The price service answers again.")
+        elif step == STEP_PUBLIC:
+            if old is not None and old > step:
+                _LOG.info("Prices come from energy-charts again.")
+            elif self.auth_refused:
+                _LOG.warning("The price service refused the token, so prices "
+                             "come from energy-charts.")
+            else:
+                _LOG.warning("The price service does not answer, so prices "
+                             "come from energy-charts.")
+        elif step == STEP_STORED:
+            if old is not None and old > step:
+                _LOG.info("The add-on uses the prices it saved again.")
+            else:
+                _LOG.warning("No price source answers, so the add-on uses "
+                             "the prices it saved.")
+        else:
+            _LOG.warning("No price source answers, and no saved price covers "
+                         "now.")
+
+
+async def resolve(opts: dict, since: datetime, until: datetime, transport,
+                  history, stamp: datetime, watch: PriceWatch,
+                  load) -> Resolved:
+    """Walk the chain and return the first step that has a price for `stamp`.
+
+    `load` is the caller's `load_prices`, passed in so that `static_tariff.py`
+    stays the one module that fetches prices. Never raises
+    for a source condition: a read that gets nowhere is a `no_data` whose
+    reason names every step, so the §11.4 row applies exactly as for a single
+    provider that failed.
+    """
+    pid = provider_id(opts)
+    cls = PROVIDERS[pid]
+    reasons = []
+    for step, sid in enumerate((pid,) + tuple(cls.FALLBACKS)):
+        # A fallback is asked for ITS OWN feed. The operator's feed override is
+        # for the first provider and would send energy-charts' request to a
+        # URL it was never meant for.
+        o = opts if step == 0 else dict(opts, price_provider=sid,
+                                        price_feed_url="")
+        read = await load(o, since, until, transport)
+        if read.match(series=lambda r: r.covers(stamp), no_data=lambda _r: False):
+            # One fallback is shipped. Any further one would also be "public".
+            where = STEP_OWN if step == 0 else STEP_PUBLIC
+            watch.note(where, reasons, opts)
+            return Resolved(read, where, tuple(reasons))
+        reasons.append(read.match(
+            series=lambda r: f"{sid}: it has no price for now",
+            no_data=lambda r: r.reason))
+    if cls.KEEPS_LAST_GOOD:
+        kept = history.stored(stamp)
+        if kept.match(series=lambda r: r.covers(stamp),
+                      no_data=lambda _r: False):
+            watch.note(STEP_STORED, reasons, opts)
+            return Resolved(kept, STEP_STORED, tuple(reasons))
+        reasons.append(kept.match(
+            series=lambda r: "price_history: it has no price for now",
+            no_data=lambda r: r.reason))
+    watch.note(STEP_NONE, reasons, opts)
+    # The reason is short on purpose: it is printed on the status page and in
+    # a WARNING every refresh. What each step said is on the DEBUG line.
+    return Resolved(PriceRead.no_data(
+        "no price source has a price for now"), STEP_NONE,
+        tuple(scrub(r, opts) for r in reasons))
+
+
+# --------------------------------------------------------------------------- #
+# The maintenance charge gate, read from the provider's prices
+# --------------------------------------------------------------------------- #
+
+@dataclass(frozen=True)
+class Gate:
+    """What the 30 s tick takes from the standing plan.
+
+    `covered` is whether a published price covers now. When it is False,
+    `cheap` is False and the charge waits: no price is not a cheap price.
+    `since` is when the cover ended, for the status line, or None when nothing
+    was ever published.
+    """
+
+    cheap: bool
+    covered: bool
+    since: datetime | None
+    words: str
+
+
+NO_PLAN = Gate(False, False, None, "No prices yet")
+
+
+def _round5(value: float) -> float:
+    # The Home Assistant template rounded the average to 5 decimals, and a
+    # price to 5 as well. Both sides are compared as it did, so a quarter that
+    # sits within 0.00001 EUR/kWh of the average gets the same answer.
+    return round(float(value), 5)
+
+
+def gate_for(published, now: datetime) -> Gate:
+    """The charge gate for `now`, from the series the chain published.
+
+    THE RULE (owner's decision, PRICE-01): the current 15-minute price is at or
+    below the average of today's prices, today being the Brussels day. This is
+    what `now_p <= avg_p` was on the Home Assistant pair. It is NOT
+    `TariffPlan.cheap_now()`, which is strictly below the mean of the firm
+    hours of the whole plan, and it is not meant to be.
+
+    `published` is a series or None. With no price for now there is no gate
+    answer: the charge waits.
+    """
+    if published is None:
+        return NO_PLAN
+    if not published.covers(now):
+        return Gate(False, False, published.last_end_before(now),
+                    "No price for now")
+    today = brussels(now).date()
+    todays = [p.eur_per_kwh for p in published.points
+              if not p.provisional and brussels(p.start).date() == today]
+    here = published.at(now)
+    if here.provisional or not todays:
+        return Gate(False, False, published.last_end_before(now),
+                    "No price for now")
+    avg = sum(todays) / len(todays)
+    cheap = _round5(here.eur_per_kwh) <= _round5(avg)
+    source = SOURCE_WORDS.get(published.provider, published.provider)
+    return Gate(cheap, True, None,
+                f"Prices from {source}, {here.eur_per_kwh:.4f} EUR/kWh now, "
+                f"{'cheap' if cheap else 'not cheap'} against today's average "
+                f"of {avg:.4f}")

goodwe_controller/app/price_history.py

@@ -581,7 +581,7 @@ class PriceHistory:
 
     # -- the one public entry point -----------------------------------------
     def carry(self, read: PriceRead, *, since: datetime, until: datetime,
-              stamp: datetime) -> PriceRead:
+              stamp: datetime, remember: bool = True) -> PriceRead:
         """Remember what this read published, then §8.3-fill the missing hours.
 
         THE ORDER IS DELIBERATE AND IS THE POINT OF THE METHOD. The read is
@@ -599,7 +599,11 @@ class PriceHistory:
         source can price is left out (§11.4 for that hour), and `no_data` comes
         back when that is every hour.
         """
-        self._remember(read, stamp)
+        if remember:
+            # PRICE-01: False only for a read that CAME FROM this store
+            # (`stored()`), which is already filed; filing it again would
+            # rewrite the same file for nothing, and nothing else may pass it.
+            self._remember(read, stamp)
         return fill_from_yesterday(read, yesterday=self.yesterday(stamp),
                                    since=since, until=until, stamp=stamp)
 
@@ -798,6 +802,37 @@ class PriceHistory:
                                 str(rec.get("provider") or "price_history"),
                                 stamp)
 
+    def stored(self, stamp: datetime) -> PriceRead:
+        """PRICE-01: every price this store holds, as one series, or no_data.
+
+        This is the LAST step of the price server's fallback (price_chain.py):
+        the answer of the last fetch that worked, kept on disk, so a site can
+        plan for as long as the days it holds last. It is a read of what was
+        PUBLISHED and filed, in the order they happened, and it is never the
+        carried fill (rule 1 holds: `carry(..., remember=False)` is how this
+        read is filled, and it is not filed again).
+
+        The prices are the all-in ones stored when they were fetched. They are
+        not worked out again, so a change of markup or taxes shows from the
+        next fetch that works, not in these.
+        """
+        if stamp.tzinfo is None or stamp.utcoffset() is None:
+            raise ValueError(f"stored({stamp!r}): a naive datetime is not an "
+                             f"instant")
+        points = []
+        for day in sorted(self._days):
+            rec = self._days[day]
+            got, _bad = _parse_points(rec.get("points") if isinstance(
+                rec, dict) else None)
+            points.extend(got)
+        if not points:
+            why = self.last_error or "it holds no prices"
+            return PriceRead.no_data(
+                f"the price history at {self.path} gives nothing: {why}")
+        points.sort(key=lambda p: p.start.astimezone(timezone.utc))
+        return PriceRead.series(points, PriceProduct.DAY_AHEAD,
+                                "price_history", stamp)
+
     # -- observability -------------------------------------------------------
     @property
     def words(self) -> str:
@@ -873,9 +908,14 @@ class NoHistory:
     last_error = "no history is kept by this caller"
     words = "not kept"
 
-    def carry(self, read: PriceRead, *, since, until, stamp) -> PriceRead:
+    def carry(self, read: PriceRead, *, since, until, stamp,
+              remember: bool = True) -> PriceRead:
         return read
 
+    def stored(self, stamp: datetime) -> PriceRead:
+        return PriceRead.no_data("this caller keeps no price history, so "
+                                 "there are no stored prices")
+
     def yesterday(self, stamp: datetime) -> PriceRead:
         return PriceRead.no_data(
             "this caller keeps no price history, so there are no prices from "

goodwe_controller/app/static/app.js

@@ -336,6 +336,39 @@
     finally { packBusy = false; }
     await refresh(true);
   }
+  // MAINT-11: start or stop ONE battery's cycle. Two or more batteries only;
+  // the add-on refuses a second cycle and says which battery is cycling.
+  async function cycleAct(what, b) {
+    if (packBusy) return;
+    packBusy = true;
+    try {
+      const r = await fetch("action", { method: "POST", headers: { "Content-Type": "application/json" },
+                                        body: JSON.stringify({ action: what, unit: b.name }) });
+      const j = await r.json().catch(() => ({}));
+      const own = j.code && t("batteries.cycle." + j.code);
+      if (!r.ok) toast(own ? say(own.description, { name: j.unit || b.name }) : (j.error || t("toast.failed")));
+      else toast(say(t("batteries.cycle.toast." + (what === "maint_start" ? "started" : "stopped")), { name: b.name }));
+    } catch (e) { toast(t("toast.failed")); }
+    finally { packBusy = false; }
+    await refresh(true);
+  }
+  // A button that cannot work is disabled (the add-on still refuses it): Stop
+  // needs this battery cycling; Start needs no battery cycling and this one on.
+  function cycleState(b) {
+    const cycling = (x) => x.maintenance !== "idle";
+    return { start: !S.batteries.some(cycling) && b.use !== false, abort: cycling(b) };
+  }
+  function cycleButtons(b, i) {
+    const can = cycleState(b);
+    const ask1 = (key, what) => () => {
+      const w = t("batteries.cycle." + key);
+      ask({ name: say(w.name, { name: b.name }), description: say(w.description, { name: b.name }), yes: w.yes },
+          () => cycleAct(what, b));
+    };
+    return h("div", { class: "cyc", style: "display:flex;gap:8px;flex-wrap:wrap;margin-top:10px" },
+      h("button", { type: "button", class: "btn", id: "bcs-" + i, disabled: !can.start, onclick: ask1("start_dialog", "maint_start") }, t("batteries.cycle.start")),
+      h("button", { type: "button", class: "btn danger", id: "bca-" + i, disabled: !can.abort, onclick: ask1("abort_dialog", "maint_abort") }, t("batteries.cycle.abort")));
+  }
   function onSwitch(b, i, where, lid) {
     const sw = h("button", { type: "button", class: "switch", role: "switch", id: "bsw-" + where + i,
                              "aria-checked": String(b.use), "aria-labelledby": lid,
@@ -370,7 +403,8 @@
         h("dt", {}, t("batteries.level")), h("dd", {}, lvl + stored),
         h("dt", {}, t("batteries.now")), h("dd", {}, b.now),
         h("dt", {}, t("batteries.today")), h("dd", {}, todayLines(b)),
-        h("dt", {}, t("batteries.why")), h("dd", { class: "muted" }, b.why || "–")));
+        h("dt", {}, t("batteries.why")), h("dd", { class: "muted" }, b.why || "–")),
+      S.batteries.length > 1 ? cycleButtons(b, i) : null);
   }
   function simpleRow(b, i) {
     const lid = "bsname-" + i;

goodwe_controller/app/static_tariff.py

@@ -204,12 +204,13 @@ import math
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
 
-from . import messages
+from . import messages, price_chain
 from .price import (
     MAX_PLAUSIBLE_EUR_KWH, Absence, PricePoint, PriceProduct, PriceRead,
     Uncertainty, _Outcome, brussels, load_prices, price_option,
     provider_configured, required_spread, uncertainty_of, widen_factor,
 )
+from .price_chain import uses_chain
 
 _LOG = logging.getLogger("goodwe.tariff.static")
 
@@ -793,6 +794,13 @@ class TariffPlan:
         self.read = read
         self.profile = profile
         self.origin = origin
+        # PRICE-01. The series the price chain found, BEFORE the yesterday fill
+        # cut it to the hours ahead: the maintenance gate needs the whole of
+        # today to know its average. None for every plan that did not come
+        # through the chain, which is every plan of every other provider.
+        self.published = None
+        self.step = None
+        self.reasons = ()
 
     # -- derived facts -------------------------------------------------------
     @property
@@ -1274,7 +1282,8 @@ def static_status(opts: dict, now: datetime):
 
 
 async def resolve_tariff(opts: dict, since: datetime, until: datetime,
-                         transport=None, now=None, *, history) -> TariffPlan:
+                         transport=None, now=None, *, history,
+                         watch=None) -> TariffPlan:
     """The full §9.2 + §11.4 resolution. MAY PERFORM I/O - see `static_plan`.
 
     ⚠️ NOT ON THE 30 s TICK, and that is a deliberate boundary rather than an
@@ -1330,13 +1339,30 @@ async def resolve_tariff(opts: dict, since: datetime, until: datetime,
     if not provider_configured(opts):
         return static_plan(opts, since, until, provisional=False, now=stamp)
 
+    if uses_chain(opts):
+        # PRICE-01. The provider names fallbacks, so its prices come from the
+        # first step of the chain that has one for now. Nothing else does.
+        found = await price_chain.resolve(
+            opts, since, until, transport, history, stamp,
+            watch if watch is not None else price_chain.PriceWatch(),
+            load=load_prices)
+        plan = found.read.match(
+            series=lambda r: _provider_plan(
+                opts, r, since, until, stamp, history,
+                remember=found.step != price_chain.STEP_STORED),
+            no_data=lambda r: _degrade(opts, r, since, until, stamp))
+        plan.published, plan.step = found.published, found.step
+        plan.reasons = found.reasons
+        return plan
+
     read = await load_prices(opts, since, until, transport)
     return read.match(
         series=lambda r: _provider_plan(opts, r, since, until, stamp, history),
         no_data=lambda r: _degrade(opts, r, since, until, stamp))
 
 
-def _provider_plan(opts, read, since, until, stamp, history) -> TariffPlan:
+def _provider_plan(opts, read, since, until, stamp, history, *,
+                   remember=True) -> TariffPlan:
     """§8.3: record what the feed published, carry yesterday into the gaps.
 
     The fill can itself return `no_data` - a feed whose points all fall outside
@@ -1344,7 +1370,12 @@ def _provider_plan(opts, read, since, until, stamp, history) -> TariffPlan:
     §11.4 row arrived at one step later, so it degrades exactly as a failed
     fetch does rather than being special-cased here.
     """
-    filled = history.carry(read, since=since, until=until, stamp=stamp)
+    if remember:
+        filled = history.carry(read, since=since, until=until, stamp=stamp)
+    else:
+        # PRICE-01: a read that came out of the store is not filed again.
+        filled = history.carry(read, since=since, until=until, stamp=stamp,
+                               remember=False)
     return filled.match(
         series=lambda r: TariffPlan(r, _quiet_profile(opts), "provider"),
         no_data=lambda r: _degrade(opts, r, since, until, stamp))

goodwe_controller/app/tariff.py

@@ -776,9 +776,14 @@ class PeakTracker:
         return r.peak_w / self.cap_w
 
     @staticmethod
-    def project(averager, now: datetime) -> Projection:
+    def project(averager, now: datetime, roll: bool = False) -> Projection:
         """End-of-quarter average if the last sample held for the rest of it.
 
+        `roll` (OPT-15, battery modes only): when `now` is past the open block
+        because no sample has come since the boundary, project the quarter
+        `now` is in, crediting the held sample as `add()` will (`max_hold_s`).
+        Without it that tick reads "no seconds left" and measures nothing.
+
         ⚠️ The two divisors are DIFFERENT and only coincide at the end of the
         block. `elapsed_w` divides by the seconds actually covered (what the
         meter has shown so far); `projected_w` divides by the full 900 s and
@@ -798,6 +803,14 @@ class PeakTracker:
         elapsed_wall = max(0.0, (now - start).total_seconds())
         elapsed = averager.elapsed_s
         acc = averager.partial_ws
+        if roll and elapsed_wall >= QUARTER_S:
+            t = now.timestamp()
+            block = int(t // QUARTER_S) * QUARTER_S
+            start = datetime.fromtimestamp(block, timezone.utc)
+            held_end = float(averager.held_t) + float(averager.max_hold_s)
+            elapsed = max(0.0, min(t, held_end) - block)
+            elapsed_wall = t - block
+            acc = max(averager.held_net_w, 0.0) * elapsed
         remaining = max(0.0, QUARTER_S - elapsed_wall)
         # ⚠️ NO `getattr` DEFAULT, AND THAT IS THE FIX, NOT A TIDY-UP. This read
         # was `getattr(averager, "_last_net", 0.0)`: a private name with a

goodwe_controller/app/ui_text/en.json

@@ -35,7 +35,7 @@
     "meter_source": {"off": "One grid power entity", "ha_dsmr": "Import and export entities", "mqtt_p1": "Meter over MQTT", "ha_signed": "One net power entity", "homewizard_local": "HomeWizard meter on the network"},
     "meter_phases": {"1": "1 phase", "3": "3 phases"},
     "shadow_mode": {"auto": "Automatic", "on": "Always on", "off": "Off"},
-    "price_provider": {"generic_dayahead": "Day-ahead market price", "custom_formula": "Your own price formula", "manual_csv": "A price file"},
+    "price_provider": {"generic_dayahead": "Day-ahead market price", "custom_formula": "Your own price formula", "manual_csv": "A price file", "price_service": "Your own price service"},
     "log_level": {"trace": "Everything, for support", "debug": "Detailed, to find a problem", "info": "Normal", "warning": "Warnings and errors", "error": "Errors only"},
     "period_days": {"mon-sun": "Every day", "mon-fri": "Monday to Friday", "sat,sun": "Saturday and Sunday", "mon": "Monday", "tue": "Tuesday", "wed": "Wednesday", "thu": "Thursday", "fri": "Friday", "sat": "Saturday", "sun": "Sunday"}
   },
@@ -92,6 +92,7 @@
         "off": {"name": "Off", "description": "Rests, and helps only when the peak limit needs it."}
       },
       "today": "Today", "why": "Why",
+      "cycle": {"start": "Start cycle", "abort": "Stop cycle", "start_dialog": {"name": "Start a cycle on {name}?", "description": "{name} empties, refills and holds full, which takes a few hours.", "yes": "Start the cycle"}, "abort_dialog": {"name": "Stop the cycle on {name}?", "description": "Every inverter is set to 0 W for a moment, then control carries on.", "yes": "Stop the cycle"}, "toast": {"started": "Cycle started on {name}.", "stopped": "Cycle stopped on {name}."}, "unit": {"description": "There is no battery with that name."}, "busy": {"description": "Only one battery can cycle at a time, and {name} is cycling now."}, "off": {"description": "{name} is switched off, so it cannot start a cycle."}, "idle": {"description": "{name} is not running a cycle."}},
       "modes_off": {"name": "Battery modes are off"},
       "how": {"name": "How the modes work", "description": "Which battery gets solar first, and when each gives power.",
         "solar_first": {"description": "Solar first gets spare solar before the other batteries, and covers the house at any hour."},
@@ -409,6 +410,9 @@
       "give_would": "Tomorrow: would give power at {at}, {eur} per kWh."
     },
     "cycle_waits": "{name} waits its turn for the monthly cycle.",
+    "no_prices_yet": "No prices yet, maintenance waits.",
+    "no_prices_since": "No prices since {at}, maintenance waits.",
+    "no_prices_since_day": "No prices since {day} {month} at {at}, maintenance waits.",
     "step_in": "The batteries step in above {kw}.",
     "step_in_would": "The batteries would step in above {kw}.",
     "period": "This 15-minute period is heading for {kw}.",

goodwe_controller/app/ui_text/nl.json

@@ -35,7 +35,7 @@
     "meter_source": {"off": "Eén entiteit voor netvermogen", "ha_dsmr": "Entiteiten voor afname en injectie", "mqtt_p1": "Meter via MQTT", "ha_signed": "Eén entiteit voor nettovermogen", "homewizard_local": "HomeWizard-meter op het netwerk"},
     "meter_phases": {"1": "1 fase", "3": "3 fasen"},
     "shadow_mode": {"auto": "Automatisch", "on": "Altijd aan", "off": "Uit"},
-    "price_provider": {"generic_dayahead": "Day-aheadprijs van de markt", "custom_formula": "Uw eigen prijsformule", "manual_csv": "Een prijsbestand"},
+    "price_provider": {"generic_dayahead": "Day-aheadprijs van de markt", "custom_formula": "Uw eigen prijsformule", "manual_csv": "Een prijsbestand", "price_service": "Uw eigen prijsdienst"},
     "log_level": {"trace": "Alles, voor support", "debug": "Uitgebreid, om een probleem te vinden", "info": "Normaal", "warning": "Waarschuwingen en fouten", "error": "Alleen fouten"},
     "period_days": {"mon-sun": "Elke dag", "mon-fri": "Maandag tot vrijdag", "sat,sun": "Zaterdag en zondag", "mon": "maandag", "tue": "dinsdag", "wed": "woensdag", "thu": "donderdag", "fri": "vrijdag", "sat": "zaterdag", "sun": "zondag"}
   },
@@ -89,6 +89,7 @@
         "off": {"name": "Uit", "description": "Rust, en helpt alleen als de piekgrens haar nodig heeft."}
       },
       "today": "Vandaag", "why": "Waarom",
+      "cycle": {"start": "Cyclus starten", "abort": "Cyclus stoppen", "start_dialog": {"name": "Cyclus starten op {name}?", "description": "{name} loopt leeg, laadt weer op en blijft vol, wat enkele uren duurt.", "yes": "Cyclus starten"}, "abort_dialog": {"name": "Cyclus stoppen op {name}?", "description": "Elke omvormer gaat even naar 0 W, daarna gaat de regeling verder.", "yes": "Cyclus stoppen"}, "toast": {"started": "Cyclus gestart op {name}.", "stopped": "Cyclus gestopt op {name}."}, "unit": {"description": "Er is geen batterij met die naam."}, "busy": {"description": "Er kan maar één batterij tegelijk een cyclus doen, en {name} is nu bezig."}, "off": {"description": "{name} staat uit en kan dus geen cyclus starten."}, "idle": {"description": "{name} doet nu geen cyclus."}},
       "modes_off": {"name": "Batterijmodi staan uit"},
       "how": {"name": "Zo werken de modi", "description": "Welke batterij eerst zonne-energie krijgt, en wanneer elke batterij levert.",
         "solar_first": {"description": "Eerst zonne-energie krijgt het overschot vóór de andere batterijen, en dekt het huis op elk uur."},
@@ -344,6 +345,9 @@
     },
     "tomorrow_trade": {"grid": "Morgen: laadt om {at}, {eur} per kWh.", "grid_would": "Morgen: zou laden om {at}, {eur} per kWh.", "give": "Morgen: levert stroom om {at}, {eur} per kWh.", "give_would": "Morgen: zou stroom leveren om {at}, {eur} per kWh."},
     "cycle_waits": "{name} wacht zijn beurt af voor de maandelijkse cyclus.",
+    "no_prices_yet": "Nog geen prijzen, onderhoud wacht.",
+    "no_prices_since": "Geen prijzen sinds {at}, onderhoud wacht.",
+    "no_prices_since_day": "Geen prijzen sinds {day} {month} om {at}, onderhoud wacht.",
     "step_in": "De batterijen springen bij boven {kw}.",
     "step_in_would": "De batterijen zouden bijspringen boven {kw}.",
     "period": "Dit kwartier gaat richting {kw}.",

goodwe_controller/app/uilayout.py

@@ -297,7 +297,9 @@ DERIVED = {
     "price_taxes_profile": "ui.region",   # a preset writes it, "own" keeps it
 }
 # Option keys the page never shows and never writes: passed through as stored.
-HIDDEN: dict = {}
+# PRICE-01: the price service token is a secret. It is set in the Configuration
+# tab (a password field there) and this page never draws it.
+HIDDEN: dict = {"price_service_token": "a secret, set on the Configuration tab"}
 
 
 def fields():

goodwe_controller/app/uipage.py

@@ -12,14 +12,17 @@ import copy
 import os
 import re
 
+from . import messages
 from . import uilayout as L
 from . import uitext
 from . import uimodel as U
 from .configui import help_of, label_of, problems_by_field, split_group
 from .validate import power_request_entities
 
-# A choice the page cannot make, only keep. None since P5's period editor.
-ONLY_IF_HELD = ()
+# A choice the page cannot make, only keep. `price_service` needs a token, and
+# the token is a secret this page never draws (uilayout.HIDDEN), so it is set on
+# the Configuration tab and the page only keeps it (PRICE-01).
+ONLY_IF_HELD = ("price_service",)
 _TIERS = ("bad", "warn", "info")
 
 
@@ -245,7 +248,7 @@ def derive_messages(errors, problems, notes, model, keys, lang="en"):
     kept = [p for p in problems if p in kept]
     notes = [n for n in notes if not set(n.keys or ()) & failed]
     return ([derive_message(err, lang) for err in errors]
-            + anchors(kept, notes, model, keys))
+            + anchors(kept, notes, model, keys, lang))
 
 
 # --------------------------------------------------------------------------- #
@@ -290,9 +293,10 @@ def targets(key: str, text: str, model: dict) -> list:
     return [(None, None)]
 
 
-def anchors(problems, notes, model, keys) -> list:
+def anchors(problems, notes, model, keys, lang="en") -> list:
     """[{field, card, tier, text}] for the refusals and notes. `field` is
-    None for a sentence that names no setting on the page."""
+    None for a sentence that names no setting on the page. A note with a Dutch
+    twin in `messages.NOTE_NL` is shown in Dutch when `lang` is "nl"."""
     out, seen = [], set()
 
     def add(field, card, tier, text):
@@ -310,10 +314,11 @@ def anchors(problems, notes, model, keys) -> list:
         add(None, None, "bad", text)
     for note in notes:
         tier = note.tier if note.tier in _TIERS else "info"
+        text = messages.NOTE_NL.get(note.text, note.text) if lang == "nl" else note.text
         for key in note.keys or (None,):
             for field, card in (targets(key, note.text, model) if key
                                 else [(None, None)]):
-                add(field, card, tier, note.text)
+                add(field, card, tier, text)
     # A sentence placed on one inverter's field is not also put on the list.
     roster = _roster()
     placed = {m["text"] for m in out

goodwe_controller/app/validate.py

@@ -1659,6 +1659,12 @@ def _price_problems(opts: dict, notes: list | None = None) -> list[str]:
                 f"{S('static_profile')} is empty, so the site has no tariff "
                 "at all while the price feed is down.")
 
+    # PRICE-01: not a fault, so an info note and no log line here (the add-on
+    # logs it once at start). With `price_service` the fixed tariff is only the
+    # plan's last fallback; the cheap window and the gate do not read it.
+    if pid == "price_service" and str(opts.get("static_profile", "") or "").strip():
+        _advise(notes, "info", ("static_profile",), messages.FIXED_TARIFF_NOTE)
+
     # ⚠️ OPT-04. THE THREE WAYS `arbitrage_enabled: true` CAN BE A LIE, refused
     # rather than logged, because a strategy that is armed in the UI and cannot
     # fire is indistinguishable from one that fires and finds no opportunity -
@@ -1706,6 +1712,26 @@ def _price_problems(opts: dict, notes: list | None = None) -> list[str]:
             f"{S('price_csv_path')} is empty. Set the path to the CSV file, or "
             "choose 'off'.")
 
+    # PRICE-01. The price service answers only to its token. Without one every
+    # fetch is refused and the add-on lives on its fallbacks, which the
+    # operator would not see: a source they chose, overridden by a layer they
+    # cannot see. A token the server cannot read as a header is the same case.
+    if pid == "price_service":
+        token = str(opts.get("price_service_token", "") or "").strip()
+        if not token:
+            problems.append(
+                f"{S('price_provider')} is 'price_service', but "
+                f"{S('price_service_token')} is empty. Set the token, or "
+                "choose another source.")
+        elif any(c.isspace() or not c.isprintable() for c in token):
+            problems.append(
+                f"{S('price_service_token')} has a space or a line break in "
+                "it. Paste the token again, with nothing around it.")
+        elif len(token) < PRICE_TOKEN_MIN:
+            problems.append(
+                f"{S('price_service_token')} is too short. Paste the whole "
+                "token.")
+
     return problems
 
 
@@ -1762,6 +1788,11 @@ def _entities_read(opts: dict) -> list[tuple[str, str, str]]:
     return out
 
 
+# PRICE-01 F5. A shorter value is not a token; it also could not be scrubbed
+# from a log (price.scrub skips values under 4 characters).
+PRICE_TOKEN_MIN = 16
+
+
 def config_notes(opts: dict, *, entities: dict | None = None,
                  month_peak_w=None) -> list[Note]:
     """UX-13: warnings that need live data, for the settings page. Never a

goodwe_controller/app/web.py

@@ -48,18 +48,21 @@ from datetime import datetime, timezone
 
 from aiohttp import web
 
-from . import messages, selfconfig, uipage, uitext
+from . import messages, price, selfconfig, uipage, uitext
 from .haentities import EntityCache
 from .homeview import region_of
 from .validate import config_notes, setup_checks
 from .config_page import CONFIG_PAGE
-from .configui import changed_keys, field_model, problems_by_field
+from .configui import (changed_keys, field_model, hide_secrets, keep_secrets,
+                       problems_by_field, secret_keys)
 from .uimodel import DeriveError, options_to_ui
 
 _LOG = logging.getLogger("goodwe.web")
 
 # OPT-11: the per-battery actions, which name a battery and a value.
 PACK_ACTIONS = ("pack_use", "pack_mode", "pack_sell")
+# MAINT-11: start or stop one battery's maintenance cycle (the unit is optional).
+MAINT_ACTIONS = ("maint_start", "maint_abort")
 
 # UX-13 P1: the page lives in app/static/ as three files - index.html,
 # app.css, app.js - plus the page words from app/ui_text/<lang>.json (English
@@ -163,6 +166,14 @@ def build_app(controller, selfcfg=None) -> web.Application:
                 return web.json_response({"ok": False,
                                           "error": result["error"]},
                                          status=400)
+        elif what in MAINT_ACTIONS and body.get("unit") is not None:
+            # MAINT-11: one battery's cycle. No unit = the old bare call below.
+            result = await controller.handle_action(what, unit=body["unit"])
+            if isinstance(result, dict) and "error" in result:
+                return web.json_response(
+                    {"ok": False, "error": result["error"],
+                     "code": result["code"], "unit": result["unit"]},
+                    status=409 if result["code"] != "unit" else 400)
         else:
             result = await controller.handle_action(what)
         if result is None:
@@ -199,6 +210,11 @@ def build_app(controller, selfcfg=None) -> web.Application:
             raise web.HTTPBadRequest(text="expected an options object")
         return body, options, None
 
+    def _secrets(info):
+        # PRICE-01 F1: every `password` option of the schema, and the price
+        # token by name in case a schema is missing.
+        return secret_keys((info or {}).get("schema"), price.SECRET_OPTIONS)
+
     async def config_model(request):
         """Everything the page needs to draw itself, from ONE Supervisor call.
 
@@ -217,13 +233,14 @@ def build_app(controller, selfcfg=None) -> web.Application:
             _LOG.error("cannot read the add-on's own options: %s", err)
             return web.json_response({"error": str(err)}, status=502)
         options = info.get("options") or {}
+        secrets = _secrets(info)
         lang = str(request.query.get("lang", "en") or "en")[:8]
         model = field_model(info.get("schema") or [],
                             info.get("translations") or {}, lang)
         model.update({
-            "options": options,
+            "options": hide_secrets(options, secrets),
             "fingerprint": hand_out(options),
-            "running": controller.o,
+            "running": hide_secrets(controller.o, secrets),
             "running_differs": changed_keys(controller.o, options),
             "lang": lang,
             # UX-13 P1: the levies preset and its year, for the P2 Settings
@@ -232,7 +249,7 @@ def build_app(controller, selfcfg=None) -> web.Application:
             # UX-13 P2: the Installer view draws from these two.
             "layout": uipage.layout(info.get("schema") or [],
                                     info.get("translations") or {}, lang),
-            "ui": options_to_ui(options),
+            "ui": hide_secrets(options_to_ui(options), secrets),
             # UX-13 P4: the setup wizard, and why it opens by itself.
             "setup": uipage.setup_spec(),
             "setup_needed": uipage.setup_needed(
@@ -271,6 +288,12 @@ def build_app(controller, selfcfg=None) -> web.Application:
             model, options = None, _body.get("options")
             if not isinstance(options, dict):
                 raise web.HTTPBadRequest(text="expected an options object")
+        try:
+            info_now = await selfcfg.info()
+            options = keep_secrets(options, info_now.get("options"),
+                                   _secrets(info_now))
+        except Exception:  # noqa: BLE001 - a check never fails for this
+            pass
         notes = []
         problems, unread = await selfconfig.problems_and_ranges(
             options, controller.hass, notes=notes)
@@ -289,7 +312,8 @@ def build_app(controller, selfcfg=None) -> web.Application:
                                        _keys_of(options),
                                        uitext.lang_of(_body.get("lang")))
                 if errors
-                else uipage.anchors(problems, notes, model, _keys_of(options)))
+                else uipage.anchors(problems, notes, model, _keys_of(options),
+                                    uitext.lang_of(_body.get("lang"))))
             payload["steps"] = uipage.step_problems(payload["messages"], model)
         if _body.get("setup"):
             payload["setup"] = [n._asdict() for n in await _setup_checks(options)]
@@ -329,9 +353,12 @@ def build_app(controller, selfcfg=None) -> web.Application:
         except ValueError:
             raise web.HTTPBadRequest(text="expected JSON")
         stored_now = None
-        if isinstance(posted, dict) and isinstance(posted.get("model"), dict):
+        secrets = frozenset(price.SECRET_OPTIONS)
+        if isinstance(posted, dict):
             try:
-                stored_now = (await selfcfg.info()).get("options") or {}
+                info_now = await selfcfg.info()
+                stored_now = info_now.get("options") or {}
+                secrets = _secrets(info_now)
             except selfconfig.SupervisorUnavailable as err:
                 _LOG.error("saving options failed: %s", err)
                 return web.json_response({"error": str(err)}, status=502)
@@ -347,6 +374,8 @@ def build_app(controller, selfcfg=None) -> web.Application:
                  "unanchored": [], "messages": messages_,
                  "steps": uipage.step_problems(messages_, model)},
                 status=422)
+        # PRICE-01 F1: a secret the page did not change is the stored one.
+        options = keep_secrets(options, stored_now, secrets)
         expect = str(body.get("fingerprint") or "")
         try:
             result = await selfconfig.save(selfcfg, options, expect,
@@ -364,7 +393,7 @@ def build_app(controller, selfcfg=None) -> web.Application:
                      "moved": refused.moved,
                      "changed_fields": (uipage.fields_of(moved, model)
                                         if model is not None else []),
-                     "stored": stored,
+                     "stored": hide_secrets(stored, secrets),
                      # The page needs the CURRENT token to be able to save
                      # again after the operator has read the difference. That
                      # is not a force door: it takes a second, deliberate press

goodwe_controller/config.yaml

@@ -1,5 +1,5 @@
 name: GoodWe RS485 Controller
-version: "0.17.0"
+version: "0.18.0"
 slug: goodwe_controller
 description: >-
   Drives a GoodWe ES/BP battery inverter over RS485 by emulating its smart
@@ -556,6 +556,10 @@ options:
   # naming that consequence on every fetch that uses an override; clearing this
   # option is what restores the full horizon.
   price_feed_url: ""
+  # PRICE-01. The bearer token for the owner's price server
+  # (`price_provider: price_service`). A password field. Empty with any other
+  # source. Never printed: not in the log, the status page or a notification.
+  price_service_token: ""
   price_horizon_h: 48
   price_timeout_s: 10
 
@@ -1085,7 +1089,7 @@ schema:
   # this line offers exactly PROVIDERS + RETIRED_PROVIDERS + 'off' - derived, not
   # typed - and register() refuses to re-register a retired id, so the two
   # cannot both claim one.
-  price_provider: list(off|generic_dayahead|custom_formula|engie_dynamic|totalenergies_dynamic|eneco_eddy|manual_csv)
+  price_provider: list(off|generic_dayahead|price_service|custom_formula|engie_dynamic|totalenergies_dynamic|eneco_eddy|manual_csv)
   price_markup_eur_kwh: float(0,1)
   price_taxes_eur_kwh: float(0,1)
 
@@ -1119,6 +1123,7 @@ schema:
   price_formula: str?
   price_csv_path: str?
   price_feed_url: str?
+  price_service_token: password?
   price_horizon_h: int(1,72)
   price_timeout_s: int(2,60)
   price_now_entity: str?

goodwe_controller/test_arbitrage.py

@@ -81,6 +81,7 @@ from datetime import datetime, timedelta, timezone
 from app import arbitrage as _arb
 from named_absence import first
 from app import main as _main
+from app.price_chain import PriceWatch
 from app import peakguard as _pg
 from app.arbiter import (
     P_ARBITRAGE, P_LOOP, P_MAINT_SHAPE, P_MAINTENANCE, P_PEAK, P_SAFETY, Claim,
@@ -2311,6 +2312,7 @@ class _T12Controller:
         self.tariff_plan = None
         self.tariff_at = None
         self.price_history = NoHistory()
+        self.price_watch = PriceWatch()      # PRICE-01: the refresh passes it on
         self.stop_event = asyncio.Event()
         self.stop_event.set()          # so the inter-refresh wait returns
         self._ticks = 0

goodwe_controller/test_maint11.py

@@ -0,0 +1,405 @@
+"""MAINT-11: start or stop the maintenance cycle of ONE battery.
+`python3 test_maint11.py`
+
+Graded here, at two and at three batteries: a start on a chosen battery with the
+slot free (and it is that battery, not the one the bare button would pick); a
+start with the slot held, in each moving phase, refused by name; an unknown
+unit; a battery switched off; a battery that refuses to give power; a stop on a
+battery that is not cycling; a stop on the cycling one; a request with no unit
+doing what it always did; the web layer's codes; the words in both languages;
+and a roster of one, whose requests, log and writes are pinned.
+See DECISIONS/MAINT-11-cycle-per-battery.md.
+
+Mutating what this file grades? Read MUTATION.md first (stale bytecode).
+"""
+
+import asyncio
+import json
+import os
+import re
+import socket
+import sys
+from datetime import datetime, timezone
+
+import aiohttp
+from aiohttp import web as aioweb
+
+from app import messages, packmode, web
+from app.main import Controller
+from app.maintenance import CHARGE, DRAIN, HOLD, IDLE, POWER_MOVING
+from app.store import DEFAULTS
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+fails = []
+
+
+def check(name, cond):
+    print(f"  {'ok  ' if cond else 'FAIL'} {name}")
+    if not cond:
+        fails.append(name)
+
+
+class MemStore:
+    def __init__(self):
+        self.data = dict(DEFAULTS)
+
+    def set(self, k, v):
+        self.data[k] = v
+
+    def get_time(self, k):
+        raw = self.data.get(k)
+        if not raw:
+            return None
+        if isinstance(raw, datetime):
+            return raw
+        parsed = datetime.fromisoformat(raw)
+        return parsed if parsed.tzinfo else parsed.replace(tzinfo=timezone.utc)
+
+    def set_time(self, k, when):
+        self.data[k] = when.astimezone(timezone.utc).isoformat() if when else None
+
+    def save(self):
+        pass
+
+
+class Hass:
+    session = None
+    token = ""
+
+    def __init__(self, n):
+        self.numbers = {"sensor.grid": 5000.0}
+        self.limits_by = {}
+        for k in range(n):
+            self.numbers[f"sensor.soc_{k}"] = 80.0
+            self.numbers[f"sensor.batt_{k}"] = 0.0
+            self.limits_by[f"number.sp_{k}"] = (-5000.0, 5000.0, 1.0)
+        self.writes = []
+
+    async def number(self, entity, invert=False):
+        v = self.numbers.get(entity)
+        return None if v is None else (-v if invert else v)
+
+    async def limits(self, entity):
+        return self.limits_by.get(entity, (None, None, None))
+
+    async def set_number(self, entity, value):
+        self.writes.append((entity, value))
+        return True
+
+    async def call(self, domain, service, data):
+        return True
+
+
+class Pub:
+    enabled = False
+
+    def publish(self, *a, **k):
+        pass
+
+    def close(self):
+        pass
+
+
+NAMES = ["inverter-a", "inverter-b", "inverter-c"]
+OPTS = dict(meter_source="off", meter_entity="sensor.grid", gain=0.6,
+            slew_w=6000, deadband_w=15, target_grid_w=0, step_w=10,
+            heartbeat_s=10, stale_input_s=15, maintenance_discharge_w=2000,
+            maintenance_charge_w=2000)
+
+
+def controller(n, modes=False):
+    opts = dict(OPTS)
+    opts["inverters"] = [
+        dict(name=NAMES[k], setpoint_entity=f"number.sp_{k}",
+             soc_entity=f"sensor.soc_{k}", batt_entity=f"sensor.batt_{k}",
+             max_w=5000.0) for k in range(n)]
+    if n == 1:
+        del opts["inverters"]
+        opts.update(setpoint_entity="number.sp_0", soc_entity="sensor.soc_0",
+                    batt_entity="sensor.batt_0", max_w=5000.0)
+    if modes:
+        opts["battery_modes_enabled"] = True
+    hass = Hass(n)
+    c = Controller(opts, hass, MemStore(), Pub(), stop=asyncio.Event())
+    for inv in c.inverters:
+        inv.dev_min, inv.dev_max = -inv.max_w, inv.max_w
+    c.auto = True
+    return c, hass
+
+
+def act(c, what, unit=None):
+    if unit is None:
+        return asyncio.run(c.handle_action(what))
+    return asyncio.run(c.handle_action(what, unit=unit))
+
+
+def phases(c):
+    return [m.phase for m in c.maints]
+
+
+def snapshot(c, hass):
+    return (phases(c), list(c.events), list(hass.writes),
+            json.dumps(c.store.data, sort_keys=True, default=str))
+
+
+def settle(c):
+    """Events carry a clock stamp; compare them without it."""
+    return [e.split(" ", 1)[1] for e in c.events]
+
+
+for N in (2, 3):
+    print(f"\n{N} batteries")
+    names = NAMES[:N]
+    last = N - 1
+
+    # --- start with the slot free -------------------------------------------
+    c, hass = controller(N)
+    bare_pick = c._maint_button(datetime.now(timezone.utc))
+    check("with every battery never cycled the bare button picks the first "
+          "(this is the card's case)", bare_pick is c.maints[0])
+    r = act(c, "maint_start", names[last])
+    check(f"start on {names[last]}: its cycle starts, nobody else's",
+          r == {"unit": names[last], "phase": DRAIN}
+          and phases(c) == [IDLE] * last + [DRAIN])
+    check("...and the log says a forced start",
+          any("forced start" in e for e in c.events))
+    check("...and the machine holding the slot is the named one",
+          c.maint_index == last)
+
+    c, hass = controller(N)
+    r = act(c, "maint_start", names[0])
+    check("start on the first battery works the same way",
+          r["unit"] == names[0] and phases(c)[0] == DRAIN
+          and phases(c)[1:] == [IDLE] * last)
+
+    # --- start with the slot held --------------------------------------------
+    for phase in POWER_MOVING:
+        for holder in range(N):
+            c, hass = controller(N)
+            c.maints[holder].store.set("phase", phase)
+            before = snapshot(c, hass)
+            bad = []
+            for k in range(N):
+                r = act(c, "maint_start", names[k])
+                bad.append(not (r.get("code") == "busy"
+                                and r["unit"] == names[holder]
+                                and names[holder] in r["error"]
+                                and "error" in r))
+            check(f"slot held by {names[holder]} in {phase}: a start on any "
+                  f"battery (itself too) is refused, naming {names[holder]}, "
+                  f"and nothing changes", not any(bad)
+                  and snapshot(c, hass) == before)
+
+    # --- unknown unit --------------------------------------------------------
+    c, hass = controller(N)
+    before = snapshot(c, hass)
+    rs = [act(c, w, u) for w in ("maint_start", "maint_abort")
+          for u in ("inverter-z", "", "Inverter-A", 7, ["inverter-a"])]
+    check("an unknown unit (wrong name, empty, wrong case, not a string) is "
+          "refused for start and for stop, and nothing changes",
+          all(r.get("code") == "unit" and r["error"]
+              == messages.maint_refused("unit") for r in rs)
+          and snapshot(c, hass) == before)
+
+    # --- a battery switched off ---------------------------------------------
+    c, hass = controller(N, modes=True)
+    c.inverters[last].store_set(packmode.USE_KEY, False)
+    before = snapshot(c, hass)
+    r = act(c, "maint_start", names[last])
+    check("a battery switched off (battery modes on) is refused by name and "
+          "nothing changes", r.get("code") == "off" and r["unit"] == names[last]
+          and names[last] in r["error"] and snapshot(c, hass) == before)
+    r = act(c, "maint_start", names[0])
+    check("...while a battery that is on still starts", r.get("phase") == DRAIN
+          and phases(c)[0] == DRAIN)
+    c, hass = controller(N)
+    c.inverters[last].store_set(packmode.USE_KEY, False)
+    check("with battery modes off the stored switch is not consulted (it is "
+          "not shown, so it cannot refuse)",
+          act(c, "maint_start", names[last]).get("phase") == DRAIN)
+
+    # --- a battery that refuses to give power ---------------------------------
+    c, hass = controller(N)
+    c.inverters[last].refused = 1
+    r = act(c, "maint_start", names[last])
+    check("a battery that refuses to give power starts like the bare button "
+          "would start it (its drain then waits, as before)",
+          r == {"unit": names[last], "phase": DRAIN})
+
+    # --- stop ---------------------------------------------------------------
+    c, hass = controller(N)
+    before = snapshot(c, hass)
+    r = act(c, "maint_abort", names[0])
+    check("a stop on a battery that is not cycling is refused and nothing "
+          "changes (no 0 W written either)", r.get("code") == "idle"
+          and names[0] in r["error"] and snapshot(c, hass) == before)
+    c.maints[last].store.set("phase", CHARGE)
+    before = snapshot(c, hass)
+    r = act(c, "maint_abort", names[0])
+    check(f"a stop on {names[0]} while {names[last]} cycles is refused, and "
+          f"{names[last]}'s cycle is not touched", r.get("code") == "idle"
+          and phases(c)[last] == CHARGE and snapshot(c, hass) == before)
+
+    for phase in POWER_MOVING:
+        c, hass = controller(N)
+        c.maints[last].store.set("phase", phase)
+        r = act(c, "maint_abort", names[last])
+        check(f"a stop on the cycling battery ({phase}) ends its cycle, "
+              f"logs the abort and sets every inverter to 0 W",
+              r == {"unit": names[last], "phase": IDLE}
+              and phases(c) == [IDLE] * N
+              and any("ABORT (operator)" in e for e in c.events)
+              and {w for w in hass.writes}
+              == {(f"number.sp_{k}", 0.0) for k in range(N)}
+              and all(i.target == 0.0 for i in c.inverters))
+
+    # --- the old request ---------------------------------------------------
+    c, hass = controller(N)
+    r = act(c, "maint_start")
+    check("a start with no unit is the old call: the bare button's pick, and "
+          "the old answer", r == {"phase": DRAIN} and phases(c)[0] == DRAIN
+          and any("forced start" in e for e in c.events))
+    r = act(c, "maint_start")
+    check("...a second bare start re-enters the drain of the cycling battery, "
+          "as it always did", r == {"phase": DRAIN} and phases(c)[0] == DRAIN)
+    c.maints[last].store.set("phase", IDLE)
+    r = act(c, "maint_abort")
+    check("...and a bare stop stops the cycling battery and answers as before",
+          r == {"phase": IDLE} and phases(c) == [IDLE] * N
+          and any("ABORT (operator)" in e for e in c.events))
+    c, hass = controller(N)
+    r = act(c, "maint_abort")
+    check("...a bare stop with nothing cycling is still accepted, as before",
+          r == {"phase": IDLE} and hass.writes
+          and {w[1] for w in hass.writes} == {0.0})
+
+# --- the web layer ----------------------------------------------------------
+print("\nthe web layer")
+
+
+async def serve(c, calls):
+    runner = aioweb.AppRunner(web.build_app(c, object()))
+    await runner.setup()
+    sock = socket.socket()
+    sock.bind(("127.0.0.1", 0))
+    port = sock.getsockname()[1]
+    sock.close()
+    await aioweb.TCPSite(runner, "127.0.0.1", port).start()
+    out = []
+    try:
+        async with aiohttp.ClientSession() as s:
+            for body in calls:
+                async with s.post(f"http://127.0.0.1:{port}/action",
+                                  json=body) as r:
+                    out.append((r.status, await r.json(content_type=None)))
+    finally:
+        await runner.cleanup()
+    return out
+
+
+c, hass = controller(2)
+rs = asyncio.run(serve(c, [
+    {"action": "maint_start", "unit": "inverter-b"},
+    {"action": "maint_start", "unit": "inverter-a"},
+    {"action": "maint_abort", "unit": "inverter-a"},
+    {"action": "maint_start", "unit": "nope"},
+    {"action": "maint_abort", "unit": "inverter-b"},
+    {"action": "maint_start", "unit": None},
+    {"action": "maint_abort"},
+    {"action": "maint_start", "unit": ""},
+]))
+check("start with a unit: 200 and the unit's answer",
+      rs[0] == (200, {"ok": True, "result": {"unit": "inverter-b",
+                                             "phase": DRAIN}}))
+check("start while the slot is held: 409, a code, the cycling battery, the "
+      "plain sentence", rs[1][0] == 409 and rs[1][1] == {
+          "ok": False, "code": "busy", "unit": "inverter-b",
+          "error": messages.maint_refused("busy", "inverter-b")})
+check("stop on a battery that is not cycling: 409 with the sentence",
+      rs[2][0] == 409 and rs[2][1]["code"] == "idle"
+      and rs[2][1]["error"] == messages.maint_refused("idle", "inverter-a"))
+check("unknown unit: 400 with the sentence", rs[3][0] == 400
+      and rs[3][1]["code"] == "unit"
+      and rs[3][1]["error"] == messages.maint_refused("unit"))
+check("stop on the cycling battery: 200", rs[4] == (
+    200, {"ok": True, "result": {"unit": "inverter-b", "phase": IDLE}}))
+check("a null unit is the bare call: 200 and the old answer",
+      rs[5] == (200, {"ok": True, "result": {"phase": DRAIN}}))
+check("a request with no unit: 200 and the old answer", rs[6] == (
+    200, {"ok": True, "result": {"phase": IDLE}}))
+check("an empty unit is refused (400), not taken as the bare call",
+      rs[7][0] == 400 and rs[7][1]["code"] == "unit"
+      and phases(c) == [IDLE, IDLE])
+
+# --- the words --------------------------------------------------------------
+print("\nthe words")
+words = {}
+for lang in ("en", "nl"):
+    with open(os.path.join(HERE, "app", "ui_text", f"{lang}.json"),
+              encoding="utf-8") as f:
+        words[lang] = json.load(f)["home"]["batteries"]["cycle"]
+for code, sentence in messages.MAINT_REFUSED.items():
+    en = words["en"][code]["description"]
+    check(f"'{code}': the page's English is the API's sentence",
+          en == sentence.replace("{unit}", "{name}"))
+    nl = words["nl"][code]["description"]
+    check(f"'{code}': the Dutch has the same placeholders",
+          sorted(re.findall(r"\{\w+\}", nl))
+          == sorted(re.findall(r"\{\w+\}", en)) and nl != en)
+check("both languages carry the same keys",
+      json.dumps(words["en"], sort_keys=True).count('":')
+      == json.dumps(words["nl"], sort_keys=True).count('":')
+      and set(words["en"]) == set(words["nl"]))
+check("every code the server can answer has a page sentence",
+      set(messages.MAINT_REFUSED) <= set(words["en"]))
+
+# --- the page ----------------------------------------------------------------
+print("\nthe page")
+JS = open(os.path.join(HERE, "app", "static", "app.js"),
+          encoding="utf-8").read()
+check("the buttons are drawn only with two or more batteries",
+      "S.batteries.length > 1 ? cycleButtons(b, i) : null" in JS)
+check("both buttons post the battery's name and ask first",
+      'JSON.stringify({ action: what, unit: b.name }) });' in JS and 'ask1("start_dialog", "maint_start")' in JS
+      and 'ask1("abort_dialog", "maint_abort")' in JS)
+check("a refusal is shown in the page's language, by its code",
+      'const own = j.code && t("batteries.cycle." + j.code);' in JS
+      and 'toast(own ? say(own.description' in JS)
+check("Stop is disabled on a battery that is not cycling",
+      'abort: cycling(b) };' in JS and "disabled: !can.abort" in JS)
+check("Start is disabled while any battery cycles",
+      "start: !S.batteries.some(cycling) && " in JS
+      and "disabled: !can.start" in JS)
+check("Start is disabled on a switched-off battery (use false, modes on)",
+      "&& b.use !== false, abort" in JS)
+check("each button carries its own flag, and only that flag",
+      'id: "bcs-" + i, disabled: !can.start, onclick: ask1("start_dialog"' in JS
+      and 'id: "bca-" + i, disabled: !can.abort, onclick: ask1("abort_dialog"' in JS)
+check("a battery counts as cycling when its phase is not idle",
+      'cycling = (x) => x.maintenance !== "idle"' in JS)
+check("the old header buttons still post a bare request",
+      'ask("maint_start", () => simple("maint_start"))' in JS
+      and "body: JSON.stringify({ action: what }) });" in JS)
+
+# --- a roster of one -----------------------------------------------------------
+print("\none battery: the requests, the log and the wire stay as they were")
+c, hass = controller(1)
+r1 = act(c, "maint_start")
+r2 = act(c, "maint_start")
+r3 = act(c, "maint_abort")
+r4 = act(c, "maint_abort")
+check("answers", [r1, r2, r3, r4] == [{"phase": DRAIN}, {"phase": DRAIN},
+                                      {"phase": IDLE}, {"phase": IDLE}])
+check("log lines (stamp removed), newest first", settle(c) == [
+    "maintenance: ABORT (operator)", "maintenance: ABORT (operator)",
+    "maintenance: forced start -> drain",
+    "maintenance: forced start -> drain"][:len(settle(c))]
+    and len(settle(c)) == 4)
+check("wire: two stops, each 0 W", hass.writes == [("number.sp_0", 0.0)] * 2)
+c, hass = controller(1)
+
+print()
+if fails:
+    print(f"{len(fails)} FAILED")
+    sys.exit(1)
+print("all passed")

goodwe_controller/test_maint13.py

@@ -415,7 +415,11 @@ def put_in_charge(c, which, hours_ago, open_min):
 
 
 def notes(h):
-    return [x for x in h.calls if x[0] == "persistent_notification"]
+    # Not the dismiss of PRICE-01's old fixed-tariff card, which every start sends.
+    # Only that dismiss: a `create` with the old id would still be counted.
+    return [x for x in h.calls if x[0] == "persistent_notification"
+            and not (x[1] == "dismiss"
+                     and x[2].get("notification_id") == "goodwe_fixed_tariff_unused")]
 
 
 for cheap in (True, False):

goodwe_controller/test_modes_p3.py

@@ -74,7 +74,7 @@ AT_7A00F12 = {
     "n1_off": "71245b227ca40bada4f71f57ea6154475f4b0bd60239c9ad4f80bffb0094514c",
     "n2_off": "56cf28010b06765c29e5479abb815d7503d570b39240d82dfc818efa90c93722",
 }
-_rows = {k: ident.run(**v)[0] for k, v in ident.SCENARIOS.items()}
+_rows = {k: ident.run(**ident.SCENARIOS[k])[0] for k in AT_7A00F12}
 _got = {k: ident.digest(v) for k, v in _rows.items()}
 for k in AT_7A00F12:
     print(f"    {k} {'same' if _got[k] == AT_7A00F12[k] else 'DIFFERS'} "
@@ -482,10 +482,16 @@ _ref = [r for r in ROWS_R if present(_first)
 print(f"    B refuses to charge; after 3 min: trades "
       f"{sorted({str(r['action']) for r in _ref})}, B roles "
       f"{sorted({r['roles'].get(B) for r in _ref})}")
+# OPT-15: B's SAFETY-73 probe (every 15 min, 34 s) is the one grid trade
+# left: PROBE_W on B alone, A resting.
+_prb = [r for r in _ref if r["action"] is not None]
 check("B refusing to charge: no grid trade is filed after the refusal is "
-      "learned, B's role is no longer 'charge', and A covers the house",
-      _ref and all(r["action"] is None for r in _ref)
-      and all(r["roles"].get(B) != modetrade.CHARGE for r in _ref)
+      "learned but B's probe (PROBE_W on B, A resting), B charges only then, "
+      "and A covers the house",
+      _ref and all(r["shares"].get(B) == -200 and r["shares"].get(A, 0) == 0
+                   for r in _prb) and len(_prb) <= 0.1 * len(_ref)
+      and all(r["roles"].get(B) != modetrade.CHARGE
+              for r in _ref if r["action"] is None)
       and sum(r["shares"].get(A, 0) > 0 for r in _ref) > len(_ref) / 2)
 
 # ============================================================================ #
@@ -516,7 +522,7 @@ print("\n7. a run edge reseeds the loop")
 
 
 def _no_reseed(c):
-    c._reseed_run_edge = lambda claims: None
+    c._reseed_run_edge = lambda claims, now: None
 
 
 def edge(rows, kind):

goodwe_controller/test_modes_p4.py

@@ -60,37 +60,42 @@ UTC0 = D0.astimezone(timezone.utc)
 print("1. no usable forecast: byte-identical to 5a4cdc2 (P3 option A)")
 # Printed by tools/opt11p4_identity.py on release/1.0 5a4cdc2 (2026-09-29),
 # goodwe-addon-checks:1. 1080 cycles each, battery modes on.
+# OPT-15: the six scenarios with a grid charge (`_ch`) were re-pinned on the
+# OPT-15 head: a charge end now holds the loop at the house's level (F2). With
+# that hold and its reseed switched off they equal 5a4cdc2's again; the others
+# (no charge) never moved.
 BASE_DIGESTS = {
     "n1_ls":
         "13f11c330263c91625acde7628426ff16dae3a9af99aebeef3051dc5b5a884ea",
     "n1_ch":
-        "ff3fb2cdf849bc74185864e0fd87c04c70a947b2f2b08d3f5c9b35ee8b75f490",
+        "97893a54f8a8e3f36ad24f100973b3ff35766527e7287a6ae30cc1c8941bac02",
     "n2_sf_ls":
         "9424e1837b805a6a31293a28b8fbad6ba611ea0bfe3240d636d68d62dc5e9f22",
     "n2_ch_ls":
-        "63e09c4323148ec4e1e6766a3c50ab270b6575ec13c35aaa1115d2c5cabc342b",
+        "9c54abddf877ddacbb3511d9cbe5231ddbda74986a89f396b83c5b2d22dc16f6",
     "n2_ls_ls":
         "98e180d43fa2aeecbe693838d2097dd4cb698c60aba8213c198d80d4e7166265",
     "n2_sf_ch":
-        "95908916505bc5fa460db7b9829d5b56ec216038caa47be4bbf7be775241c7a2",
+        "d16d3cac0d9f720b68212c5899624d2a02fb6f7ecae258ddfc8dbba560d47bcf",
     "n1_ls_fc_down":
         "13f11c330263c91625acde7628426ff16dae3a9af99aebeef3051dc5b5a884ea",
     "n1_ch_fc_down":
-        "ff3fb2cdf849bc74185864e0fd87c04c70a947b2f2b08d3f5c9b35ee8b75f490",
+        "97893a54f8a8e3f36ad24f100973b3ff35766527e7287a6ae30cc1c8941bac02",
     "n2_sf_ls_fc_down":
         "9424e1837b805a6a31293a28b8fbad6ba611ea0bfe3240d636d68d62dc5e9f22",
     "n2_ch_ls_fc_down":
-        "63e09c4323148ec4e1e6766a3c50ab270b6575ec13c35aaa1115d2c5cabc342b",
+        "9c54abddf877ddacbb3511d9cbe5231ddbda74986a89f396b83c5b2d22dc16f6",
     "n2_ls_ls_fc_down":
         "98e180d43fa2aeecbe693838d2097dd4cb698c60aba8213c198d80d4e7166265",
     "n2_sf_ch_fc_down":
-        "95908916505bc5fa460db7b9829d5b56ec216038caa47be4bbf7be775241c7a2",
+        "d16d3cac0d9f720b68212c5899624d2a02fb6f7ecae258ddfc8dbba560d47bcf",
 }
 import opt11p4_identity as ident                                # noqa: E402
 
 got = ident.digests()
 for k, v in BASE_DIGESTS.items():
-    check(f"{k}: same digest as 5a4cdc2", got.get(k) == v)
+    check(f"{k}: pinned digest (5a4cdc2; OPT-15 for the _ch ones)",
+          got.get(k) == v)
 check("every scenario is pinned", set(got) == set(BASE_DIGESTS))
 for k in [k for k in got if k.endswith("_fc_down")]:
     check(f"{k}: a set but unavailable forecast equals no forecast",

goodwe_controller/test_opt20.py

@@ -0,0 +1,267 @@
+"""Runnable check for OPT-20.  `python3 test_opt20.py`
+
+A refusal probe (OPT-15 F3, SAFETY-73) asks the probing battery PROBE_W and
+nothing else. On TEST-23 (OPT-15 g7) the probe made the trade ask 2500 W: B
+was pinned at 200 W and the allocator put the other 2300 W on A, which sat in
+its maintenance charge phase at 0 W, with the grid at 3100 W for 34 s.
+
+1. modetrade: the ask carries PROBE_W for the probing battery, the other
+   chargers' ratings as without the probe, and `size()` adds the probe on top
+   of their share (or asks PROBE_W exactly, or nothing).
+2. main: the ask carries PROBE_W for exactly the pins filed this tick, so the
+   first and the last cycle of a window do not move another battery's share.
+3. The real Controller in the lagged replay, with B refusing and probed while
+   A is (a) in its maintenance charge phase (also with the charge shaped to
+   0 W), (b) idle, (c) a normal charger in the same run, and the OPT-15 rig's
+   g7 sequence: A's command is the same through the window as just before it,
+   B gets PROBE_W, and the commanded charge rises by PROBE_W at most.
+4. Battery modes on with no probe: byte-identical to release/1.0 bf9019e.
+
+Out of scope, and unchanged: a normal (non-probing) trade placed on a battery
+in maintenance charge (OPT-11 P4 F4) and the action-log wording (UX-38).
+Mutations: MUTATION.md says how to run them (purged copies); the 12 of
+OPT-20 are listed in the pull request.
+"""
+
+import dataclasses
+import logging
+import os
+import sys
+from types import SimpleNamespace
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+sys.path.insert(0, HERE)
+sys.path.insert(0, os.path.join(HERE, "tools"))
+logging.disable(logging.WARNING)
+
+import opt20_scen as sc                                        # noqa: E402
+from app import arbitrage, modetrade, packmode                 # noqa: E402
+from app import control as ctl                                 # noqa: E402
+from app import main                                           # noqa: E402
+from app.arbiter import Claim, P_SAFETY                        # noqa: E402
+
+fails = []
+
+
+def check(name, cond):
+    print(f"  {'ok  ' if cond else 'FAIL'} {name}")
+    if not cond:
+        fails.append(name)
+
+
+PW = ctl.PROBE_W
+A, B = sc.A, sc.B
+
+# ============================================================================ #
+print("1. modetrade: the ask and the size")
+_runs = SimpleNamespace(on=True, cheap=SimpleNamespace(holds=lambda n: True),
+                        charge_useful=lambda: True, give_at=lambda n: None,
+                        sell=None)
+
+
+def _dec(packs, **kw):
+    args = dict(charge_ok=True, sell_ok=True, trade_why=None, price_now=0.1,
+                headroom_w=3000.0, floor_pct=20.0, ceiling_pct=95.0,
+                house_w=800.0)
+    args.update(kw)
+    return modetrade.decide(_runs, sc.UTC0, packs, **args)
+
+
+_pb = modetrade.Pack(B, True, packmode.CHEAP_HOURS, False, 2500.0, 30.0, 10.0,
+                     refused=-1, probing=True)
+_pa = modetrade.Pack(A, True, packmode.CHEAP_HOURS, False, 2500.0, 50.0, 10.0)
+_pm = dataclasses.replace(_pa, mode=packmode.SOLAR_FIRST, idle=False)
+_pi = dataclasses.replace(_pa, mode=packmode.SOLAR_FIRST)
+
+_t_alone = _dec([_pb, _pm])
+check("a probe beside a battery in maintenance asks PROBE_W and no more",
+      _t_alone.action == modetrade.CHARGE and _t_alone.ask_w == -PW
+      and _t_alone.probe_w == PW)
+check("...beside an idle battery that cannot charge from the grid too",
+      _dec([_pb, _pi]).ask_w == -PW and _dec([_pb, _pi]).probe_w == PW)
+_t_two = _dec([_pb, _pa])
+check("...beside a normal charger the ask is that charger's rating plus "
+      "PROBE_W", _t_two.ask_w == -2500.0 - PW and _t_two.probe_w == PW)
+_t_np = _dec([dataclasses.replace(_pb, probing=False), _pa])
+check("no probe: the ask is the chargers' ratings, probe_w is 0 (as before)",
+      _t_np.ask_w == -2500.0 and _t_np.probe_w == 0.0
+      and _dec([_pa, _pm]).ask_w == -2500.0
+      and modetrade.Tick({}, {}, None, 0.0, None).probe_w == 0.0)
+
+
+def sz(ask, probe_w, lo, room, action=modetrade.CHARGE):
+    t = modetrade.Tick({}, {}, action, ask, None, probe_w)
+    return modetrade.size(t, (lo, 2500.0), room)
+
+
+check("size, a probe alone: PROBE_W, whatever the headroom above it",
+      sz(-PW, PW, -(PW), 3000.0) == -PW and sz(-PW, PW, -2700.0, 9000.0) == -PW)
+check("...exactly PROBE_W or nothing: a headroom or a bound under it files "
+      "no trade (a smaller ask voids the pin and the allocator would place "
+      "it elsewhere)",
+      sz(-PW, PW, -2700.0, PW - 1) == 0.0 and sz(-PW, PW, -(PW - 1), 3000.0)
+      == 0.0 and sz(-PW, PW, -2700.0, 0.0) == 0.0
+      and sz(-PW, PW, -2700.0, PW) == -PW)
+check("size with another charger: its share is sized as without the probe, "
+      "the probe's PROBE_W is added on top",
+      sz(-2700.0, PW, -2700.0, 3000.0) == -2700.0
+      and sz(-2700.0, PW, -2700.0, 1000.0) == -1200.0
+      and sz(-2700.0, PW, -1700.0, 3000.0) == -1700.0
+      and sz(-2700.0, PW, -2700.0, 0.0) == 0.0)
+check("size with no probe is what it was (ask, bound, headroom)",
+      sz(-2500.0, 0.0, -2700.0, 3000.0) == -2500.0
+      and sz(-2500.0, 0.0, -2700.0, 1000.0) == -1000.0
+      and sz(-2500.0, 0.0, -1800.0, 3000.0) == -1800.0
+      and sz(-2500.0, 0.0, -2700.0, None) == 0.0
+      and modetrade.size(modetrade.Tick({}, {}, None, 0.0, None),
+                         (-5.0, 5.0), 3000.0) == 0.0)
+
+# ============================================================================ #
+print("\n2. main: the ask carries the pins filed this tick")
+
+
+def trade(tick, pins, bound=(-2700.0, 2500.0), room=3000.0):
+    """The trade `_mode_trade()` files: (claims, size or None)."""
+    claims = [Claim.set("refused", P_SAFETY, -PW * 1.0, ctl.PROBING,
+                        actuator="x") for _ in range(pins)]
+    me = SimpleNamespace(
+        mode_tick=tick, loop_bound=lambda cl: bound, arb_headroom_w=room,
+        mode_runs=SimpleNamespace(
+            cheap=SimpleNamespace(start=sc.UTC0, end=sc.UTC0,
+                                  mean_eur_kwh=0.1),
+            sell=None, level_eur_kwh=0.1),
+        arb=None, _arb_action=None, log_event=lambda *a, **k: None)
+    filed = main.Controller._mode_trade(me, claims, sc.UTC0)
+    t = [c for c in claims if c.source == arbitrage.SOURCE]
+    return filed, (t[0].value if t else None), me.mode_tick
+
+
+_t0 = modetrade.Tick({}, {A: modetrade.CHARGE}, modetrade.CHARGE, -2500.0,
+                     None, 0.0)
+check("the pin is filed but decide() ran before it (the window's first "
+      "cycle): the charger keeps its whole ask and the pin is added",
+      trade(_t0, 1)[1] == -2700.0 and trade(_t0, 1)[2].probe_w == PW)
+check("the window closed after decide() (its last cycle): the probe's PROBE_W "
+      "leaves the ask, so no battery is handed it",
+      trade(_t_two, 0)[1] == -2500.0
+      and trade(_t_alone, 0) == (False, None, trade(_t_alone, 0)[2])
+      and trade(_t_alone, 0)[2].action is None)
+check("pin and ask agree: nothing changes",
+      trade(_t_two, 1)[1] == -2700.0 and trade(_t_alone, 1)[1] == -PW
+      and trade(_t0, 0)[1] == -2500.0)
+
+# ============================================================================ #
+print("\n3. the real Controller: B refuses and is probed")
+
+
+def charge(r):
+    return -sum(min(0.0, v) for v in r["shares"].values())
+
+
+def window_checks(rows, label):
+    """Per probe window: A as just before, B at PROBE_W (or 0 when nothing is
+    traded), the charge up by at most PROBE_W."""
+    win = sc.windows(rows)
+    ok_a = ok_b = ok_sum = ok_grid = True
+    for i, j in win:
+        pre = rows[i - 1]
+        lo, hi = max(0, i - 3), min(len(rows) - 1, j + 3)
+        ext = rows[lo:hi + 1]
+        base_sum = sum(min(0.0, v) for v in pre["shares"].values())
+        ok_a &= all(abs(r["shares"].get(A, 0.0) - pre["shares"].get(A, 0.0))
+                    < 1e-6 for r in ext)
+        bs = [r["shares"].get(B, 0.0) for r in ext]
+        if any(r["action"] for r in rows[i:j + 1]):
+            ok_b &= set(bs) <= {0.0, -PW} and bs.count(-PW) >= 20
+        else:       # a drain comes first: the window trades nothing
+            ok_b &= set(bs) == {0.0}
+        ok_sum &= all(charge(r) <= charge(pre) + PW + 1e-6 for r in ext)
+        ok_grid &= max(r["grid"] for r in ext) <= pre["grid"] + PW + 50.0
+    n_ch = sum(1 for r in rows if r["probing"] and r["action"])
+    print(f"    {label}: {len(win)} window(s), {n_ch} probing cycles with a "
+          f"trade, highest grid "
+          f"{max(r['grid'] for r in rows):.0f} W")
+    return win, ok_a, ok_b, ok_sum, ok_grid
+
+
+SCEN = {
+    "(a) A in its maintenance charge phase": (
+        sc.day(sc.SF_CH, a_maint=sc.MAINT_CHARGE), "same"),
+    "(a') ...with the charge shaped to 0 W": (
+        sc.day(sc.SF_CH, a_maint=sc.MAINT_CHARGE, shaped=True), "same"),
+    "(b) A idle at 0 W (Solar first, the sun covers the house)": (
+        sc.day(sc.SF_CH, house_w=-10.0), "same"),
+    "(c) A a normal charger in the same run": (sc.day(sc.CH_CH), "same"),
+    "(g7) the OPT-15 rig: drain, then maintenance charge at 0 W": (
+        sc.g7(), "same"),
+    # Not the fix's: A gives the house, and a charge ask means no other
+    # battery gives (OPT-11 owner answer 3), so A rests, as on bf9019e.
+    "(b2) A gives 800 W to the house": (sc.day(sc.SF_CH), "rests"),
+}
+for _name, (_rows, _kind) in SCEN.items():
+    win, ok_a, ok_b, ok_sum, ok_grid = window_checks(_rows, _name)
+    check(f"{_name}: a probe happens (non-vacuous)", len(win) >= 1)
+    if _kind == "same":
+        check(f"{_name}: A's command is the same through each window, first "
+              "and last cycle included", ok_a)
+        check(f"{_name}: the grid rises by PROBE_W at most (plus 50 W of "
+              "noise)", ok_grid)
+    else:
+        check(f"{_name}: A stops giving for the window (the one-sign rule, "
+              "as on bf9019e), charges nothing and gives back after it",
+              all(r["shares"].get(A, 0.0) == 0.0 for i, j in win
+                  for r in _rows[i + 1:j]) and all(
+                  _rows[j + 4]["shares"].get(A, 0.0) > 0.0 for i, j in win))
+    check(f"{_name}: B gets PROBE_W and nothing else", ok_b)
+    check(f"{_name}: the commanded charge rises by PROBE_W at most", ok_sum)
+
+# The g7 sequence in detail: the probe after the drain.
+_g7 = SCEN["(g7) the OPT-15 rig: drain, then maintenance charge at 0 W"][0]
+_w7 = sc.windows(_g7)
+_after = [w for w in _w7 if _g7[w[0]]["now"] > sc.at(18.3, sc.GUTC0)]
+_peak7 = max(r["grid"] for r in _g7 if r["now"] > sc.at(18.3, sc.GUTC0))
+print(f"    g7: probes after the drain at "
+      f"{[_g7[w[0]]['now'].astimezone(sc.L).strftime('%H:%M:%S') for w in _after]}"
+      f", grid after the drain at most {_peak7:.0f} W (TEST-23: 3100 W)")
+check("g7: the probe after A's drain asks B for 200 W with A at 0 W "
+      "(TEST-23: -2300 W on A, the grid at 3100 W)",
+      _after and all(
+          abs(r["shares"].get(A, 0.0)) < 1e-6 for i, j in _after
+          for r in _g7[i:j + 4]) and _peak7 <= 800.0 + PW + 50.0)
+check("g7: during the drain no probe trades (a drain comes first)",
+      all(r["action"] is None for r in _g7
+          if sc.at(18.0, sc.GUTC0) <= r["now"] < sc.at(18.28, sc.GUTC0)))
+_acts = [r["reason"] for i, j in _after for r in _g7[i:j + 1]
+         if r["action"]]
+check("g7: the action log's trade line names the probe's watts, 200 W",
+      _acts and all(f"{PW:.0f} W on {B}" in a for a in _acts))
+check("no opposite-direction split on any of these cycles",
+      not [r for _r, _ in SCEN.values() for r in _r
+           if any(v > 0 for k, v in r["shares"].items() if r["action"])
+           and any(v < 0 for v in r["shares"].values())])
+
+# ============================================================================ #
+print("\n4. battery modes on, no probe: byte-identical to release/1.0 bf9019e")
+# Printed by tools/opt20_scen.py on release/1.0 bf9019e (2026-10-15),
+# goodwe-addon-checks:1.
+AT_BASE = {
+    "sf_ch": "422d6578a7decf1ae3749edd1898ff3cd0541d904c95f636cdd9b1de8c1a07c9",
+    "ch_ch": "15fc25dd34186e56d34b752d37c9e8613295ba737938c92454acca08c83080fb",
+    "ch_ch_maint":
+        "e46e3c666dd63ab33b56e83c0a560c07cec7774a9a70560f55c62a6ae6f55920",
+}
+_got = sc.no_probe_digests()
+for _k in AT_BASE:
+    print(f"    {_k} {'same' if _got[_k] == AT_BASE[_k] else 'DIFFERS'} "
+          f"{_got[_k][:16]}")
+check("with no refusal every share, grid, trade sentence, role and plant "
+      "power of a scripted cheap run equals bf9019e's (A Solar first, A "
+      "charging, A in maintenance charge)", _got == AT_BASE)
+
+print()
+if fails:
+    print(f"{len(fails)} FAILED:")
+    for f in fails:
+        print(f"  - {f}")
+    sys.exit(1)
+print("all checks passed")

goodwe_controller/test_price.py

@@ -534,11 +534,15 @@ FIXTURES = {
                          [v / 1000 for v in EPEX_EUR_MWH]),
     "custom_formula": (columnar_feed(EPEX_EUR_MWH), FORMULA_EUR_KWH),
     "manual_csv": (None, [0.1834, -0.0210, 0.3115]),
+    # PRICE-01: the owner's price server answers the same columnar layout.
+    "price_service": (columnar_feed(EPEX_EUR_MWH),
+                      [v / 1000 for v in EPEX_EUR_MWH]),
 }
 
 check(f"the plugins that ship after TARIFF-07 and TARIFF-15 are registered "
       f"{sorted(PROVIDERS)}",
-      set(PROVIDERS) == {"generic_dayahead", "custom_formula", "manual_csv"})
+      set(PROVIDERS) == {"generic_dayahead", "custom_formula", "manual_csv",
+                         "price_service"})
 check(f"...and the three withdrawn ids resolve to NOTHING "
       f"{sorted(RETIRED_PROVIDERS)}",
       set(RETIRED_PROVIDERS) == {"engie_dynamic", "totalenergies_dynamic",
@@ -571,7 +575,7 @@ def canned(body):
     """A transport that serves recorded bytes and records that it was used."""
     calls = []
 
-    async def t(url, timeout_s):
+    async def t(url, timeout_s, headers=None):
         calls.append((url, timeout_s))
         return body
     t.calls = calls
@@ -603,6 +607,9 @@ def load_any(pid):
         # is exactly what section 3 grades.
         return load(pid, {"price_formula": json.dumps(ENECO_CARD)},
                     transport=canned(body))
+    if pid == "price_service":
+        return load(pid, {"price_service_token": "test-token-1234"},
+                    transport=canned(body))
     return load(pid, transport=canned(body))
 
 
@@ -898,7 +905,16 @@ _networked = sorted(pid for pid, cls in PROVIDERS.items()
 # SAME CAPTURED BYTES (section 13c), because it reads the same endpoint with
 # the same parser. A networked plugin with no capture is what this line exists
 # to forbid.
-_replayed = ["custom_formula", "generic_dayahead"]
+#
+# ⚠️ PRICE-01 PUT A THIRD ON IT, AND ITS CAPTURE IS A RESHAPE, SAID PLAINLY. The
+# price server answers only to a token this session does not hold, so no real
+# answer of its own exists to replay. Its answer is the energy-charts layout
+# (design, API section), so test_price_service.py replays the REAL energy-charts
+# two-day capture with the three extra keys the design lists (`covers`,
+# `source`, `fetched_at`). The prices and instants are real; the wrapper is the
+# design's. The first answer captured from the live server on the rig test
+# replaces it - that is the open item, and it is in the PRICE-01 report.
+_replayed = ["custom_formula", "generic_dayahead", "price_service"]
 check(f"the networked plugins are {_networked}, and EVERY one of them is "
       f"replayed from a captured real body ({_replayed}) - no shipped plugin "
       f"reaches a network this file has never seen answer (TARIFF-07)",
@@ -1252,7 +1268,7 @@ check(f"a negative day-ahead price passes through, all-in {_neg}",
 # (TARIFF-15): it reads the SAME columnar document, which has no per-point
 # flag, and applies arithmetic to it - arithmetic cannot invent a provenance
 # the document never carried.
-_SETTLED_FEED = {"generic_dayahead", "custom_formula"}
+_SETTLED_FEED = {"generic_dayahead", "custom_formula", "price_service"}
 for pid in sorted(set(READS) - _SETTLED_FEED):
     read = READS[pid]
     flags = derived(lambda r=read: [p.provisional for p in r.points])

goodwe_controller/test_price_forecast.py

@@ -1133,6 +1133,11 @@ _T17_KEYS = ["price_taxes_profile"]
 # `export_price_eur_kwh` is untouched, every site on the scalar is unaffected,
 # and it lives in this dict and in config.yaml and nowhere else.
 _T16_KEYS = ["price_export_formula"]
+# PRICE-01 added the eighth: `price_service_token`, the bearer token of the
+# owner's price server. An ADDITION, like the three above: nothing was renamed,
+# every other provider ignores it, and it lives in this dict and in config.yaml
+# (as a password field) and nowhere else.
+_P01_KEYS = ["price_service_token"]
 check(f"the in-code mirror holds exactly TARIFF-02's, TARIFF-03's, OPT-04's, "
       f"TARIFF-15's, TARIFF-17's and TARIFF-16's keys - FCST-03 still added "
       f"none of its own {_defaults}",
@@ -1142,7 +1147,7 @@ check(f"the in-code mirror holds exactly TARIFF-02's, TARIFF-03's, OPT-04's, "
                            "price_horizon_h", "price_timeout_s",
                            "static_profile"]
                           + _OPT04_KEYS + _T15_KEYS + _T17_KEYS
-                          + _T16_KEYS))
+                          + _T16_KEYS + _P01_KEYS))
 # ...and the later keys are genuinely NEW, not a rename of something that was
 # already there, or the line above would pass while the mirror silently lost a
 # key.
@@ -1151,7 +1156,7 @@ check("...and OPT-04's four, TARIFF-15's one, TARIFF-17's one and TARIFF-16's "
       "are all still present",
       isinstance(_defaults, list)
       and len(set(_defaults) - set(_OPT04_KEYS) - set(_T15_KEYS)
-              - set(_T17_KEYS) - set(_T16_KEYS)) == 9)
+              - set(_T17_KEYS) - set(_T16_KEYS) - set(_P01_KEYS)) == 9)
 # ⚠️ AND THE ONE TARIFF-17 IS THE HOUR-VARYING TWIN OF IS STILL THERE, BY NAME.
 # The line above counts nine, and a rename of `price_taxes_eur_kwh` to
 # `price_taxes_profile` would also count nine. The scalar path being unchanged

goodwe_controller/test_price_run_fixes.py

@@ -0,0 +1,635 @@
+"""Runnable check for OPT-15, the P3 price-run fixes.  `python3 test_price_run_fixes.py`
+
+The OPT-11 P3 post-merge test on TEST-23 (5a4cdc2) found three defects. This
+file drives the pure modules and the REAL Controller (tools/opt11p3_replay.py)
+with the lagged model (`Lag`: command dead time, meter and battery reading
+age, the P1 debounce, 1 s cycles), which reproduces all three on 5a4cdc2.
+
+1. F1: a quarter edge while charging does not stop the charge (the guard
+   projects the quarter `now` is in), and a real guard stop still latches.
+   At two inverters SAFETY-91's `next_quarter()` already does that for the
+   guard; at one inverter only the rolled projection does.
+2. F2: the export overshoot at a charge end stays within 0.15 x rating in
+   the model and in the lagged variants (TEST-23 measured -1120 W).
+3. F3: a charge refusal inside a cheap run is probed every 15 minutes.
+4. The P3 and SAFETY-79 invariants on the lagged runs.
+5. Modes off is byte-identical to release/1.0 e3e4ba6, also with a late P1
+   sample on every quarter boundary, and the harness sees a change there.
+
+DECISIONS/OPT-11-battery-modes.md has the record. Mutations (MUTATION.md,
+purged copies, graded over this file and test_modes_p3.py) are listed in the
+pull request.
+"""
+
+import logging
+import os
+import sys
+from dataclasses import replace
+from datetime import datetime, timedelta, timezone
+from types import SimpleNamespace
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+sys.path.insert(0, HERE)
+sys.path.insert(0, os.path.join(HERE, "tools"))
+logging.disable(logging.WARNING)
+
+import opt11p3_identity as ident                               # noqa: E402
+import opt11p3_replay as rp                                    # noqa: E402
+from app import arbitrage, modetrade, packmode, peakguard      # noqa: E402
+from app import tariff                                         # noqa: E402
+from app import control as ctl                                 # noqa: E402
+from app import main                                           # noqa: E402
+from app.p1 import QuarterAverager, make_sample                # noqa: E402
+from app.tariff import PeakTracker                             # noqa: E402
+from named_absence import nth, present                         # noqa: E402
+
+fails = []
+
+
+def check(name, cond):
+    print(f"  {'ok  ' if cond else 'FAIL'} {name}")
+    if not cond:
+        fails.append(name)
+
+
+L = timezone(timedelta(hours=2))
+A, B = "inverter-a", "inverter-b"
+D0 = datetime(2026, 9, 9, 0, 0, tzinfo=L)
+UTC0 = D0.astimezone(timezone.utc)
+# Cheap 02:00-04:00 local, dear 19:00-20:00, flat otherwise (two days).
+PRICES = [0.30] * 192
+for _i in range(8, 16):
+    PRICES[_i] = 0.10
+for _i in range(76, 80):
+    PRICES[_i] = 0.40
+WPTS = [(UTC0 + timedelta(minutes=15 * i), 900, p)
+        for i, p in enumerate(PRICES)]
+RATING = rp.RATING
+BOUND = 0.15 * RATING
+AIM = rp.PEAK_CAP - 50
+CH_SF = {"a": (True, packmode.CHEAP_HOURS, False),
+         "b": (True, packmode.SOLAR_FIRST, False)}
+
+
+def at(h):
+    return UTC0 + timedelta(hours=h)
+
+
+def house(steps, base=800.0):
+    """[(t, W)] for the replay: `base`, then each (local hour, W) from then."""
+    out = [(UTC0.timestamp() - 10, base)]
+    out += [(at(h).timestamp(), float(w)) for h, w in steps]
+    return out
+
+
+def run(start_h, hours, *, lag=None, soc_a=20.0, steps=(), choice=None,
+        refuse=(), patch=None, check_cb=None, n=2):
+    rows = []
+
+    def cb(c, h, now, pr):
+        sh = dict(c.allocation.shares) if c.allocation is not None and \
+            c.allocation.shares else {}
+        rows.append(dict(
+            now=now, grid=h.grid(), shares=sh,
+            action=getattr(c.arb, "action", None),
+            reason=getattr(c.arb, "reason", None) or "",
+            roles=dict(c.mode_tick.roles) if c.mode_tick else {},
+            refused=c.inverters[0].refused,
+            probing=c.inverters[0].probe_from is not None,
+            headroom=c.arb_headroom_w,
+            p={u: p.p for u, p in h.plants.items()}))
+        if check_cb:
+            check_cb(c, h, now, pr)
+    st, c = rp.run("p3_ch_sell", house(steps), WPTS, at(start_h),
+                   3600 * hours, check=cb, lag=lag, n=n,
+                   soc0={"a": soc_a, "b": 60.0},
+                   choice=CH_SF if choice is None else choice,
+                   refuse=refuse, patch=patch,
+                   extra={"cycle_cost_threshold_eur": 0.10})
+    return rows, c
+
+
+def stops(rows):
+    """[(row index, row)] where a grid charge stopped."""
+    return [(i, rows[i]) for i in range(1, len(rows))
+            if rows[i - 1]["action"] == arbitrage.CHARGE
+            and rows[i]["action"] != arbitrage.CHARGE]
+
+
+def q(when):
+    return int(when.timestamp() // 900)
+
+
+def banked(c, rows):
+    """The add-on's own P1 blocks for the quarters that had a grid charge."""
+    chq = {q(r["now"]) for r in rows if r["action"] == arbitrage.CHARGE}
+    return [b.offtake_avg_w for b in c.p1.blocks if q(b.start) in chq]
+
+
+def mixed(rows):
+    return [r for r in rows if any(v > 0 for v in r["shares"].values())
+            and any(v < 0 for v in r["shares"].values())]
+
+
+# Close to TEST-23's plant: 1 s cycles, readings 1 s old, a battery that
+# follows the previous second's command.
+LAG = rp.Lag(tau_s=0.05, ramp_w_s=1e9)
+
+# ============================================================================ #
+print("1. F1: a quarter edge while charging")
+# 1a. The projection on the edge tick, before the new block's first sample.
+_avg = QuarterAverager(phases=1, max_hold_s=30.0)
+_edge = datetime(2026, 9, 9, 12, 0, tzinfo=timezone.utc)
+for _s in range(-900, 1, 1):
+    _t = _edge + timedelta(seconds=_s - 0.35)
+    _avg.add(make_sample("ha_signed", 3300.0, 0.0, phases=1, ingest_ts=_t,
+                         ingest_mono=0.0))
+_now = _edge + timedelta(seconds=0.6)
+_old = PeakTracker.project(_avg, _now)
+_new = PeakTracker.project(_avg, _now, roll=True)
+
+
+def _decide(pr):
+    return peakguard.decide(pr, batt_w=-2500.0, cap_w=3500.0, margin_w=50.0,
+                            reading=None, achievable_w=5000.0, soc=50.0,
+                            soc_floor=20.0, max_hold_s=30.0)
+
+
+print(f"    edge tick: old block {_old.explain()}; rolled {_new.explain()}")
+check("on the edge tick the open block is still the old one: the guard reads "
+      "'no seconds left' and the headroom is unmeasured (the F1 cause)",
+      _old.elapsed_s >= 900 and peakguard.charge_headroom_w(
+          _decide(_old)) is None)
+_later = QuarterAverager(phases=1, max_hold_s=30.0)
+for _s in range(-900, 1, 1):
+    _later.add(make_sample("ha_signed", 3300.0, 0.0, phases=1,
+                           ingest_ts=_edge + timedelta(seconds=_s - 0.35),
+                           ingest_mono=0.0))
+_later.add(make_sample("ha_signed", 3300.0, 0.0, phases=1,
+                       ingest_ts=_edge + timedelta(seconds=0.6),
+                       ingest_mono=0.0))
+_real = PeakTracker.project(_later, _now)
+_hr = peakguard.charge_headroom_w(_decide(_new))
+check("rolled, it is the new quarter, measured, and equal to what the "
+      "averager projects once the new block's first sample is in; the "
+      "headroom is the house and the aim (3450 - 800 W)",
+      _new.block_start == _edge == _real.block_start and _new.complete
+      and abs(_new.projected_w - _real.projected_w) < 0.01
+      and abs(_new.elapsed_s - 0.6) < 1e-6
+      and _hr is not None and abs(_hr - 2650.0) < 1.0)
+_gap = QuarterAverager(phases=1, max_hold_s=30.0)
+_gap.add(make_sample("ha_signed", 3300.0, 0.0, phases=1,
+                     ingest_ts=_edge - timedelta(seconds=100), ingest_mono=0))
+_gp = PeakTracker.project(_gap, _edge + timedelta(seconds=40), roll=True)
+check("...and a sample older than the hold is not credited: past the hold "
+      "the rolled quarter is blind, as the averager would make it",
+      _gp.elapsed_s == 40.0 and _gp.covered_frac == 0.0
+      and peakguard.blindness(_gp, 30.0, False) is not None)
+check("without `roll` nothing changes (the modes-off path)",
+      PeakTracker.project(_avg, _now, roll=False) == _old)
+# Review of #157 (X1): a held export is credited as 0 W, as `add()` banks it,
+# never as a negative that would pull the rolled quarter under the meter.
+_exp = QuarterAverager(phases=1, max_hold_s=30.0)
+for _s in range(-900, 1, 1):
+    _exp.add(make_sample("ha_signed", 0.0, 1500.0, phases=1,
+                         ingest_ts=_edge + timedelta(seconds=_s - 0.35),
+                         ingest_mono=0.0))
+_ep = PeakTracker.project(_exp, _now, roll=True)
+_exp.add(make_sample("ha_signed", 0.0, 1500.0, phases=1,
+                     ingest_ts=_edge + timedelta(seconds=0.6),
+                     ingest_mono=0.0))
+_er = PeakTracker.project(_exp, _now)
+check("...and a held export rolls in as 0 W, equal to what the averager "
+      "banks for those seconds",
+      _ep.block_start == _er.block_start and _ep.projected_w == 0.0
+      and _ep.elapsed_w == 0.0 and _er.projected_w == 0.0)
+
+# 1b. The lagged replay: 02:00-03:30 local, a Cheap hours battery charging
+# under an 800 W house through five quarter edges.
+ROWS1, C1 = run(1.9, 1.6, lag=LAG, choice={
+    "a": (True, packmode.CHEAP_HOURS, False),
+    "b": (True, packmode.LEFTOVER_SOLAR, False)})
+_ch1 = [r for r in ROWS1 if r["action"] == arbitrage.CHARGE]
+_edges1 = sorted({q(r["now"]) for r in _ch1})
+_st1 = stops(ROWS1)
+print(f"    {len(_ch1)} charge cycles over {len(_edges1)} quarters; stops "
+      f"{[(r['now'].astimezone(L).strftime('%H:%M:%S'), r['reason'][:40]) for _, r in _st1]}")
+check("no stop at any quarter edge crossed while charging (two inverters; "
+      "see below for the old projection)",
+      len(_edges1) >= 5 and not _st1)
+
+
+def _no_roll(c):
+    real = c.peak.project
+    c.peak.project = lambda a, now, roll=False: real(a, now)
+
+
+_CH1 = {"a": (True, packmode.CHEAP_HOURS, False),
+        "b": (True, packmode.LEFTOVER_SOLAR, False)}
+# One inverter: SAFETY-91's `next_quarter()` is not applied there, so this is
+# where the old projection stops the charge at every edge.
+ROWS1N, C1N = run(1.9, 1.6, lag=LAG, n=1, choice=_CH1)
+ROWS1M, _ = run(1.9, 0.6, lag=LAG, n=1, patch=_no_roll, choice=_CH1)
+_m1 = stops(ROWS1M)
+check("one inverter: no stop at any edge crossed while charging",
+      len({q(r["now"]) for r in ROWS1N if r["action"] == arbitrage.CHARGE})
+      >= 5 and not stops(ROWS1N))
+check("non-vacuous: with the old projection one inverter stops at every edge "
+      "for want of a measured headroom (5a4cdc2 then latched the quarter; "
+      "the latch fix alone keeps it to that tick)",
+      len(_m1) >= 2 and all("headroom" in r["reason"] and
+                            r["now"].astimezone(L).minute % 15 == 0 and
+                            r["now"].astimezone(L).second == 0
+                            for _, r in _m1))
+# Two inverters: since SAFETY-91 the guard grades the next quarter past a
+# block's end (`tariff.next_quarter()`), so the old projection no longer
+# stops there; the rolled one gives the same quarters.
+ROWS1O, C1O = run(1.9, 1.6, lag=LAG, patch=_no_roll, choice=_CH1)
+print(f"    two inverters, old projection: {len(stops(ROWS1O))} stops; banked "
+      f"{[round(x) for x in banked(C1O, ROWS1O)]} against "
+      f"{[round(x) for x in banked(C1, ROWS1)]} rolled")
+check("two inverters: SAFETY-91 already holds the edge (no stop with the old "
+      "projection), and rolling it changes no banked quarter",
+      not stops(ROWS1O) and banked(C1O, ROWS1O) == banked(C1, ROWS1))
+
+# 1c. A real guard stop still latches, and the 500 W minimum stays.
+# House: 800 W; 3700 W at 02:20-02:21; 3000 W from 02:26 (headroom 450 W
+# in the next quarter); 2850 W from 02:40 (600 W).
+ROWS2, C2 = run(1.9, 0.9, lag=LAG, steps=[
+    (2 + 20 / 60, 3700), (2 + 21 / 60, 800), (2 + 26 / 60, 3000),
+    (2 + 40 / 60, 2850)])
+_st2 = stops(ROWS2)
+_first = _st2[0][1] if _st2 else None
+_q2 = q(_first["now"]) if _first else None
+_after2 = [r for r in ROWS2 if _first and r["now"] > _first["now"]
+           and q(r["now"]) == _q2]
+print(f"    guard stop at "
+      f"{_first['now'].astimezone(L).strftime('%H:%M:%S') if _first else None}"
+      f" ({_first['reason'][:40] if _first else ''})")
+check("a mid-quarter 3.7 kW load stops the charge for the peak and it stays "
+      "off for the rest of that quarter, the house back at 800 W",
+      _first is not None and _first["now"].astimezone(L).minute == 20
+      and ("peak" in _first["reason"] or "headroom" in _first["reason"])
+      and _after2 and all(r["action"] is None for r in _after2))
+_starts = [b for a, b in zip(ROWS1 + ROWS2, (ROWS1 + ROWS2)[1:])
+           if a["action"] != arbitrage.CHARGE
+           and b["action"] == arbitrage.CHARGE]
+_low = [r for r in ROWS2 if r["headroom"] is not None
+        and 0 < r["headroom"] <= modetrade.START_W and r["action"] is None]
+print(f"    {len(_starts)} charge starts, lowest headroom at a start "
+      f"{min(r['headroom'] for r in _starts):.0f} W; {len(_low)} cycles "
+      f"with 0-500 W of headroom and no charge")
+check("the 500 W minimum stays: every charge starts with more than 500 W of "
+      "headroom, and a house at 3 kW (450 W) holds it off",
+      _starts and _low and all(r["headroom"] > modetrade.START_W
+                               for r in _starts))
+
+# 1d. An unmeasured headroom stops one tick and does not latch.
+_c1d = run(1.9, 0.2, soc_a=20.0)[1]
+_n1d = UTC0 + timedelta(hours=2, minutes=5)
+_ok1d = False
+if _c1d.mode_tick is not None and _c1d.mode_tick.action == modetrade.CHARGE:
+    _c1d.arb_headroom_w = None
+    _t1 = _c1d._mode_roles(_n1d, None)
+    _c1d.arb_headroom_w = 3000.0
+    _t2 = _c1d._mode_roles(_n1d + timedelta(seconds=1), None)
+    _c1d.arb_headroom_w = 0.0
+    _t3 = _c1d._mode_roles(_n1d + timedelta(seconds=2), None)
+    _c1d.arb_headroom_w = 3000.0
+    _t4 = _c1d._mode_roles(_n1d + timedelta(seconds=3), None)
+    _ok1d = (_t1.action is None and _t2.action == modetrade.CHARGE
+             and _t3.action is None and _t4.action is None
+             and _c1d._charge_blocked_q == q(_n1d))
+check("an unmeasured headroom (None) stops the charge that tick only; a "
+      "measured 0 W stops it for the rest of the quarter", _ok1d)
+
+
+# 1e. Review of #157: gaps cannot flip the charge. A headroom forced to None
+# every other cycle flipped it 1799 times in 30 min before this; the second
+# unmeasured stop in a quarter now latches it.
+def _gaps(c):
+    real, k = c._mode_roles, [0]
+
+    def mr(now, maint):
+        k[0] += 1
+        if k[0] % 2 == 0:
+            c.arb_headroom_w = None
+        return real(now, maint)
+    c._mode_roles = mr
+
+
+_rows1e = run(2.0, 0.5, lag=LAG, patch=_gaps)[0]
+_flips = {}
+_on1e = next((i for i, r in enumerate(_rows1e)
+              if r["action"] == arbitrage.CHARGE), len(_rows1e))
+for _a, _b in zip(_rows1e[_on1e:], _rows1e[_on1e + 1:]):
+    if (_a["action"] == arbitrage.CHARGE) != (_b["action"] == arbitrage.CHARGE):
+        _flips[q(_b["now"])] = _flips.get(q(_b["now"]), 0) + 1
+print(f"    None every other cycle: charge on/off changes per quarter "
+      f"{sorted(_flips.values())}")
+check("a headroom unmeasured every other cycle changes the charge at most "
+      "4 times a quarter (restart, stop, restart, stop and latch)",
+      _flips and max(_flips.values()) <= 4)
+
+# ============================================================================ #
+print("\n2. F2: the export overshoot at a charge end")
+# A fills to its 95 % ceiling at about 04:03 under an 800 W house, and
+# Solar first B takes the house over.
+VARIANTS = {
+    "model (5 s, instant readings)": None,
+    "model, lagged (1 s cycles)": rp.Lag(),
+    "TEST-23 plant, meter 1 s": rp.Lag(tau_s=0.05, ramp_w_s=1e9),
+    "TEST-23 plant, meter 2 s": rp.Lag(tau_s=0.05, ramp_w_s=1e9,
+                                       meter_s=2.0),
+    "meter 2 s, battery reading fresh": rp.Lag(tau_s=0.05, ramp_w_s=1e9,
+                                               meter_s=2.0, batt_s=0.0),
+    "2 s cycles, meter 2 s": rp.Lag(tick=2.0, meter_s=2.0),
+    "5 s meter": rp.Lag(tick=5.0, meter_s=5.0, batt_s=2.0),
+    "slow battery (8 s, 2 s dead), 5 s meter": rp.Lag(
+        tau_s=8.0, dead_s=2.0, tick=5.0, meter_s=5.0, batt_s=2.0),
+}
+
+
+def charge_end(rows, lag):
+    """(min grid, max grid, pre-edge grid, settle s) after the first charge
+    end, over 120 s; settle: from then on within 40 W of the target."""
+    st = stops(rows)
+    if not st:
+        return None
+    i = st[0][0]
+    tick = rp.TICK if lag is None else lag.tick
+    w = [r["grid"] for r in rows[i:i + int(120 / tick)]]
+    settle = next((j * tick for j in range(len(w))
+                   if all(abs(x + 10) < 40 for x in w[j:])), None)
+    return min(w), max(w), rows[i - 1]["grid"], settle
+
+
+F2 = {}
+for _k, _lag in VARIANTS.items():
+    F2[_k] = charge_end(run(3.9, 0.5, lag=_lag, soc_a=86.0)[0], _lag)
+    print(f"    {_k}: {F2[_k] and tuple(round(x) if x is not None else x for x in F2[_k])}")
+check(f"every variant: the charge ends, the export overshoot stays within "
+      f"0.15 x rating ({BOUND:.0f} W), no import above the charge's own, and "
+      f"the grid settles within 45 s (90 s for the slow battery)",
+      all(v is not None and v[0] >= -BOUND and v[1] <= v[2] + 50
+          and v[3] is not None and v[3] <= (90 if k.startswith("slow")
+                                            else 45)
+          for k, v in F2.items()))
+
+
+def _no_hold(c):
+    c._edge_grid = lambda end, now: c.grid
+
+
+_pre = charge_end(run(3.9, 0.5, lag=VARIANTS["TEST-23 plant, meter 2 s"],
+                      soc_a=86.0, patch=_no_hold)[0],
+                  VARIANTS["TEST-23 plant, meter 2 s"])
+print(f"    without the hold (5a4cdc2's reseed), meter 2 s: "
+      f"{_pre and tuple(round(x) if x is not None else x for x in _pre)}")
+check("non-vacuous: without the hold the lagged model shows TEST-23's "
+      "overshoot (over 0.4 x rating), so it cannot hide again",
+      _pre is not None and _pre[0] < -0.4 * RATING)
+
+# The hold must not hide a real load change at the edge.
+_down = run(3.9, 0.5, lag=LAG, soc_a=86.0, steps=[])[0]
+_i_end = stops(_down)[0][0] if stops(_down) else None
+_edge_t = _down[_i_end]["now"] if _i_end else None
+
+
+def _edge_step(w):
+    """The same charge end with the house stepping to `w` at the edge:
+    (seconds until the loop moves B off E, lowest grid, highest grid after
+    the first 3 s)."""
+    if _edge_t is None:
+        return None
+    h = (_edge_t - UTC0).total_seconds() / 3600
+    rows = run(3.9, 0.5, lag=LAG, soc_a=86.0, steps=[(h, w)])[0]
+    after = [r for r in rows if r["now"] >= _edge_t]
+    first = nth(after, 0, "the edge cycle")
+    if not present(first):
+        return None
+    e = first["shares"].get(B)
+    moved = next(((r["now"] - _edge_t).total_seconds() for r in after
+                  if r["shares"].get(B) != e), None)
+    return moved, min(r["grid"] for r in after[:60]), max(
+        r["grid"] for r in after[3:60]), [r["grid"] for r in after[:60]]
+
+
+_fall, _rise = _edge_step(200.0), _edge_step(1800.0)
+print(f"    house 800 -> 200 W at the edge: loop moves after {_fall[0]} s, "
+      f"lowest {_fall[1]:.0f} W; 800 -> 1800 W: after {_rise[0]} s, highest "
+      f"{_rise[2]:.0f} W")
+check("the hold does not hide a load change: a house that falls at the edge "
+      "ends it within 5 s, with no export beyond the fall and the bound; one "
+      "that rises is followed by EDGE_HOLD_S, with no import beyond the rise",
+      _fall and _rise and _fall[0] is not None and _fall[0] <= 5
+      and _fall[1] >= -600 - BOUND
+      and _rise[0] is not None and _rise[0] <= main.EDGE_HOLD_S + 2
+      and _rise[2] <= 1000 + 50)
+_peak = _edge_step(4500.0)
+_g10 = nth(_peak[3], 10, "10 s after the edge") if _peak else None
+print(f"    800 -> 4500 W at the edge: grid 10 s later {_g10} W")
+check("...and when the peak floor takes the command during the hold, the "
+      "hold ends: 10 s after the edge B gives its rating (grid 4500 - 2500 W), "
+      "not the aim the floor holds", present(_g10) and _g10 <= 2100)
+
+# Review of #157: the hold's own rules, on `_reseed_run_edge()` and
+# `_edge_grid()` directly (target -10 W, deadband 15 W, EDGE_HOLD_S 18 s).
+_T0 = UTC0
+
+
+def _held(grid, batt, s, last_b=-2500.0, end=False):
+    """(what the loop reads, still held) for a charge end E=800 W at +s."""
+    f = SimpleNamespace(
+        _edge=(800.0, 1.0, _T0 + timedelta(seconds=main.EDGE_HOLD_S), last_b),
+        tuning=ctl.Tuning(target_grid_w=-10.0), grid=grid,
+        site_batt_w=batt, i_w=0.0)
+    g = main.Controller._edge_grid(f, end, _T0 + timedelta(seconds=s))
+    return g, f._edge is not None
+
+
+_hs = main.EDGE_HOLD_S
+check("the hold: the loop reads the target while the meter still shows the "
+      "step; it ends on a new trade or claim, when the meter comes within the "
+      "deadband of the target, and at EDGE_HOLD_S (later only while the "
+      "battery still moves to E, and never past twice that)",
+      _held(3300.0, -2500.0, 1) == (-10.0, True)
+      and _held(3300.0, -2500.0, 1, end=True) == (3300.0, False)
+      and _held(5.0, -2500.0, 1) == (-10.0, True)
+      and _held(4.0, -2500.0, 1) == (4.0, False)
+      and _held(3300.0, -2500.0, _hs + 1) == (3300.0, False)
+      and _held(3300.0, -2000.0, _hs + 1) == (-10.0, True)
+      and _held(3300.0, -2000.0, 2 * _hs + 1) == (3300.0, False))
+# Review of #157 (X4): a reading that has passed E is not "still moving".
+check("...and a battery reading already past E does not extend the hold",
+      _held(3300.0, 900.0, _hs + 1, last_b=700.0) == (3300.0, False))
+_f = SimpleNamespace(site_batt_w=500.0, grid=90.0, _edge=None,
+                     tuning=ctl.Tuning(target_grid_w=-10.0), site_max_w=5000.0,
+                     loop_bound=lambda claims: None, target=None, i_w=None)
+main.Controller._reseed_run_edge(_f, [], _T0)
+check("...and a small step is held too (E 600 W from 500 W)",
+      _f.target == 600.0 and _f._edge is not None and _f._edge[:2] == (
+          600.0, 1.0))
+
+# ============================================================================ #
+print("\n3. F3: a charge refusal inside a cheap run is probed")
+# A refuses to charge from its first charge; the plant accepts again at
+# 02:40. The cheap run lasts to 04:45.
+
+
+def _accept(c, h, now, pr):
+    if now >= at(2 + 40 / 60):
+        h.plants["a"].refuse_charge = False
+
+
+ROWS3, C3 = run(1.9, 1.2, soc_a=30.0, refuse=("a",), check_cb=_accept)
+_ref3 = [r for r in ROWS3 if r["refused"]]
+_pr3 = [r for r in ROWS3 if r["probing"] and r["action"] == arbitrage.CHARGE]
+_probe_q = sorted({r["now"].astimezone(L).strftime("%H:%M") for r in _pr3})
+_end3 = next((r for r in ROWS3 if _ref3 and r["now"] > _ref3[-1]["now"]),
+             None)
+print(f"    refused {len(_ref3)} cycles; charge probes at {_probe_q}; "
+      f"after: {_end3 and _end3['now'].astimezone(L).strftime('%H:%M:%S')}"
+      f" {_end3 and _end3['action']}")
+check("while A refuses, it is probed every 15 minutes: at PROBE_W exactly, "
+      "with B resting (no share on B, one sign)",
+      len(_probe_q) >= 2 and all(
+          r["shares"].get(A) == -ctl.PROBE_W and r["shares"].get(B, 0) == 0
+          for r in _pr3))
+check("...outside a probe the refusal wins: no grid trade and A never "
+      "charges",
+      all(r["action"] is None and r["shares"].get(A, 0) >= 0
+          for r in _ref3 if not r["probing"]))
+check("...and the probe after the plant accepts again ends the refusal and "
+      "the charge resumes in the same run",
+      _end3 is not None and _end3["now"] < at(3)
+      and any(r["action"] == arbitrage.CHARGE and r["shares"].get(A, 0)
+              < -1000 for r in ROWS3 if r["now"] > _end3["now"]))
+# Review of #157 (M15): outside its probe a refuser is no charger, so the
+# others are not made to rest. With solar to spare, Solar first B takes it.
+_rows3s = run(1.9, 0.5, soc_a=30.0, refuse=("a",), steps=[(2, -1500)])[0]
+_pt = [r["now"] for r in _rows3s if r["probing"]]
+_sun = [r for r in _rows3s if r["refused"] and not r["probing"]
+        and r["now"] >= at(2 + 5 / 60) and not any(
+            timedelta(0) < r["now"] - t <= timedelta(seconds=30) for t in _pt)]
+_bsun = sorted(r["shares"].get(B, 0) for r in _sun)
+print(f"    solar 1500 W over the house, A refusing: B's share outside probes "
+      f"{_bsun[0] if _bsun else None} .. {_bsun[-1] if _bsun else None} W")
+check("...outside a probe the others are not held at rest: Solar first B "
+      "takes the spare solar (from 30 s after a probe)",
+      _sun and all(r["shares"].get(B, 0) < -1000 for r in _sun))
+_pk = modetrade.Pack(A, True, packmode.CHEAP_HOURS, False, 2500.0, 30.0,
+                     10.0, refused=-1, probing=True)
+_runs = SimpleNamespace(on=True, cheap=SimpleNamespace(holds=lambda n: True),
+                        charge_useful=lambda: True, give_at=lambda n: None,
+                        sell=None)
+
+
+def _dec(packs, **kw):
+    args = dict(charge_ok=True, sell_ok=True, trade_why=None,
+                price_now=0.1, headroom_w=3000.0, floor_pct=20.0,
+                ceiling_pct=95.0, house_w=800.0)
+    args.update(kw)
+    return modetrade.decide(_runs, UTC0, packs, **args)
+
+
+_pb = modetrade.Pack(B, True, packmode.SOLAR_FIRST, False, 2500.0, 60.0,
+                     10.0)
+check("modetrade: a probing charge refuser is a charger, the others rest; "
+      "not while in maintenance, not on Leftover solar or Solar first, not "
+      "latched, not under the 500 W minimum, not with the guard engaged, "
+      "and never in energy() (the plan's sizing)",
+      _dec([_pk, _pb]).action == modetrade.CHARGE
+      and _dec([_pk, _pb]).roles == {A: modetrade.CHARGE, B: modetrade.REST}
+      and _dec([replace(_pk, idle=False), _pb]).action is None
+      and all(_dec([replace(_pk, mode=m), _pb]).action is None
+              for m in (packmode.LEFTOVER_SOLAR, packmode.SOLAR_FIRST))
+      and _dec([_pk, _pb], blocked=True).action is None
+      and _dec([_pk, _pb], headroom_w=450.0).action is None
+      and _dec([_pk, _pb], charge_ok=False, trade_why="peak").action is None
+      and modetrade.energy([_pk], 20.0, 95.0)[1] == 0.0
+      and _dec([replace(_pk, probing=False), _pb]).action is None)
+
+# On the new base (release/1.0 e3e4ba6): SAFETY-78's drain comes before the
+# probe, and P4's day plan sets how far a probing Leftover solar battery goes.
+_ls = replace(_pk, mode=packmode.LEFTOVER_SOLAR)
+_dr = _dec([_pk, _pb], draining=True)
+check("a monthly drain comes before the probe: no grid charge while another "
+      "battery drains, the probing refuser included (why 'cycle')",
+      _dr.action is None and _dr.why == "cycle"
+      and _dr.roles.get(A) != modetrade.CHARGE
+      and _dec([_pk, _pb], draining=False).action == modetrade.CHARGE)
+check("with a day plan a probing Leftover solar battery is a charger up to "
+      "its planned level and no further; without a level for it, it is not",
+      _dec([_ls, _pb], targets={A: 60.0}).action == modetrade.CHARGE
+      and _dec([_ls, _pb], targets={A: 25.0}).action is None
+      and _dec([_ls, _pb], targets={B: 60.0}).action is None
+      and _dec([_ls, _pb]).action is None
+      and modetrade.energy([_ls], 20.0, 95.0, targets={A: 60.0})[1] == 0.0)
+
+# ============================================================================ #
+print("\n4. invariants on these runs (and part 1c's house in the model)")
+_rows4, _c4 = run(1.9, 0.9, steps=[
+    (2 + 20 / 60, 3700), (2 + 21 / 60, 800), (2 + 26 / 60, 3000),
+    (2 + 40 / 60, 2850)])
+_all = ROWS1 + ROWS2 + ROWS3 + _rows4
+check("no opposite-direction split on any cycle", not mixed(_all))
+_ceil = peakguard.quarter_ceiling_w(rp.PEAK_CAP, None)[0]
+_bk0 = banked(_c4, _rows4)
+_bk = banked(C1, ROWS1) + banked(C2, ROWS2)
+print(f"    banked quarters with a grid charge: model {len(_bk0)}, highest "
+      f"{max(_bk0):.2f} W; lagged {len(_bk)}, highest {max(_bk):.2f} W "
+      f"(e3e4ba6: the same 3451.37 W); ceiling - margin {_ceil - 50:.0f} W")
+check("every banked 15-minute period with a grid charge is at most "
+      "quarter_ceiling_w() - margin (SAFETY-79) in the model; lagged, the "
+      "battery's lag may use 2 W of the 50 W margin, as on e3e4ba6",
+      _bk0 and max(_bk0) <= _ceil - 50 + 0.5
+      and _bk and max(_bk) <= _ceil - 50 + 2.0)
+check("Solar first and Leftover solar never charge from the grid: no charge "
+      "role and no charge share on B while the site charges",
+      all(r["roles"].get(B) != modetrade.CHARGE for r in _all)
+      and all(r["shares"].get(B, 0) >= 0 for r in _all
+              if r["action"] == arbitrage.CHARGE))
+check("selling is off: no sale on any cycle",
+      packmode.SELLING_ENABLED is False
+      and all(r["action"] != arbitrage.DISCHARGE for r in _all))
+
+# ============================================================================ #
+print("\n5. modes off: byte-identical to release/1.0 e3e4ba6")
+# Printed by tools/opt11p3_identity.py on release/1.0 e3e4ba6 (2026-10-13),
+# goodwe-addon-checks:1, with this branch's harness (same API). n1 and n2 are
+# also 5a4cdc2's; the lag ones moved with SAFETY-90/91 (n2_lag now equals n2:
+# the next-quarter grading removed the edge tick's blindness at N=2).
+AT_BASE = {
+    "n1": "71245b227ca40bada4f71f57ea6154475f4b0bd60239c9ad4f80bffb0094514c",
+    "n2": "56cf28010b06765c29e5479abb815d7503d570b39240d82dfc818efa90c93722",
+    "n1_lag": "86ef0f5ad8da1498ff7dcf59262a177bef847a0b201ce804e947c8eab5f07190",
+    "n2_lag": "56cf28010b06765c29e5479abb815d7503d570b39240d82dfc818efa90c93722",
+}
+_got = {k: ident.digest(ident.run(**ident.SCENARIOS[k])[0])
+        for k in AT_BASE}
+for _k in AT_BASE:
+    print(f"    {_k} {'same' if _got[_k] == AT_BASE[_k] else 'DIFFERS'} "
+          f"{_got[_k][:16]}")
+check("with battery modes off every command, integrator, allocation and "
+      "trade sentence equals e3e4ba6's, also when every quarter boundary's "
+      "cycle still sees the old P1 block", _got == AT_BASE)
+
+_real_project = tariff.PeakTracker.project
+tariff.PeakTracker.project = staticmethod(
+    lambda a, now, roll=False: _real_project(a, now, roll=True))
+try:
+    _moved = ident.digest(ident.run(**ident.SCENARIOS["n1_lag"])[0]) \
+        != AT_BASE["n1_lag"]
+finally:
+    tariff.PeakTracker.project = _real_project
+check("non-vacuous: the rolled projection leaking into modes off moves the "
+      "late-sample scenario", _moved)
+
+print()
+if fails:
+    print(f"{len(fails)} FAILED:")
+    for f in fails:
+        print(f"  - {f}")
+    sys.exit(1)
+print("all checks passed")

goodwe_controller/test_price_secret.py

@@ -0,0 +1,412 @@
+"""PRICE-01 round 2 (F1): a `password` option never reaches a page.
+`python3 test_price_secret.py`
+
+The real web app (`web.build_app`) runs over a fake Supervisor that holds a
+site on `price_service` with a token. The token string must be absent from
+`/config`, `/config/model` (`options`, `running`, `ui`), `/config/validate`,
+a good save's answer and every refused save's answer. A save that sends the
+placeholder, an empty field or no key keeps the stored token; a new value
+replaces it. The same holds for any option the schema calls a password, not
+only this one name.
+
+⚠️ MUTATING A MODULE THIS FILE GRADES? Purge `__pycache__` first, or use
+`tools/mutation_run.sh`. See MUTATION.md.
+"""
+
+import asyncio
+import copy
+import json
+import logging
+import os
+import sys
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+sys.path.insert(0, os.path.join(HERE, "tools"))
+logging.disable(logging.WARNING)
+
+from aiohttp import ClientSession, web as aioweb          # noqa: E402
+
+import translations_lint as TL                            # noqa: E402
+import ux13_demo as D                                     # noqa: E402
+from app import configui, price, web                      # noqa: E402
+from app.configui import SECRET_SHOWN                     # noqa: E402
+
+fails = []
+
+
+def check(name, cond):
+    print(f"  {'ok  ' if cond else 'FAIL'} {name}")
+    if not cond:
+        fails.append(name)
+
+
+TOKEN = "tk-SECRET-0123456789-abcdef"
+NEW_TOKEN = "tk-REPLACED-9876543210-zyxw"
+SCHEMA = D.schema_ui(D.CONFIG)
+TRANSLATIONS = {"en": TL.parse_translation_file(
+    os.path.join(HERE, "translations", "en.yaml"))}
+SITE = dict(D.defaults(D.CONFIG), setpoint_entity="number.goodwe_setpoint",
+            soc_entity="sensor.soc", batt_entity="sensor.batt",
+            price_provider="price_service", price_service_token=TOKEN)
+
+
+class Sup:
+    def __init__(self, options, schema=SCHEMA):
+        self.options, self.schema, self.writes = copy.deepcopy(options), schema, []
+
+    async def info(self):
+        return {"options": copy.deepcopy(self.options), "schema": self.schema,
+                "translations": TRANSLATIONS}
+
+    async def write_options(self, o):
+        self.writes.append(copy.deepcopy(o))
+        self.options = copy.deepcopy(o)
+
+    async def restart(self, c):
+        raise AssertionError
+
+
+class Hass:
+    session = None
+    token = ""
+
+    async def limits(self, _e):
+        return (-5000.0, 5000.0, 1.0)
+
+    async def states(self):
+        return []
+
+
+class Ctl:
+    def __init__(self, o):
+        self.o, self.hass, self.inverters = dict(o), Hass(), []
+
+    def log_event(self, *a, **k):
+        pass
+
+    def status_payload(self):
+        return {"banner": "", "level": "ok", "rows": [], "checks": []}
+
+
+async def serve(sup, ctl_options=None):
+    runner = aioweb.AppRunner(web.build_app(Ctl(ctl_options or sup.options), sup))
+    await runner.setup()
+    site = aioweb.TCPSite(runner, "127.0.0.1", 0)
+    await site.start()
+    port = site._server.sockets[0].getsockname()[1]
+    return runner, f"http://127.0.0.1:{port}/"
+
+
+async def scenario():
+    out = {}
+    sup = Sup(SITE)
+    runner, root = await serve(sup)
+    seen = []                                  # every answer body, as text
+    try:
+        async with ClientSession() as s:
+            async def get(path):
+                async with s.get(root + path) as r:
+                    t = await r.text()
+                    seen.append(t)
+                    return r.status, t
+
+            async def post(path, body):
+                async with s.post(root + path, json=body) as r:
+                    t = await r.text()
+                    seen.append(t)
+                    return r.status, t
+
+            _, page = await get("config")
+            out["page"] = page
+            _, raw = await get("config/model?lang=en")
+            m = json.loads(raw)
+            out["model"] = m
+            out["raw_model"] = raw
+            out["field"] = [f for g in m["groups"] for f in g["fields"]
+                            if f["key"] == "price_service_token"]
+
+            # a model of a site with NO token: shown empty, not as 'set'
+            sup0 = Sup(dict(SITE, price_service_token=""))
+            r0, root0 = await serve(sup0)
+            try:
+                async with s.get(root0 + "config/model?lang=en") as r:
+                    out["model_unset"] = await r.json()
+            finally:
+                await r0.cleanup()
+
+            # --- classic page save: the page posts `options`, placeholder in
+            opts = copy.deepcopy(m["options"])
+            opts["peak_cap_w"] = 4100
+            st, body = await post("config/save",
+                                  {"options": opts, "fingerprint": m["fingerprint"]})
+            out["classic_placeholder"] = (st, sup.options["price_service_token"],
+                                          sup.options["peak_cap_w"], body)
+            # --- classic save with the field emptied
+            _, raw2 = await get("config/model?lang=en")
+            m2 = json.loads(raw2)
+            opts = copy.deepcopy(m2["options"])
+            opts["price_service_token"] = ""
+            opts["peak_cap_w"] = 4200
+            st, body = await post("config/save",
+                                  {"options": opts, "fingerprint": m2["fingerprint"]})
+            out["classic_empty"] = (st, sup.options["price_service_token"],
+                                    sup.options["peak_cap_w"])
+            # --- classic save with the key left out
+            _, raw2 = await get("config/model?lang=en")
+            m2 = json.loads(raw2)
+            opts = copy.deepcopy(m2["options"])
+            del opts["price_service_token"]
+            opts["peak_cap_w"] = 4250
+            st, body = await post("config/save",
+                                  {"options": opts, "fingerprint": m2["fingerprint"]})
+            out["classic_absent"] = (st, sup.options["price_service_token"])
+            # --- the new settings page: model in, with and without base
+            _, raw3 = await get("config/model?lang=en")
+            m3 = json.loads(raw3)
+            ui = copy.deepcopy(m3["ui"])
+            ui["peak_cap_w"] = 4300
+            st, body = await post("config/save", {
+                "model": ui, "base": copy.deepcopy(m3["ui"]),
+                "fingerprint": m3["fingerprint"]})
+            out["ui_base"] = (st, sup.options["price_service_token"])
+            _, raw3 = await get("config/model?lang=en")
+            m3 = json.loads(raw3)
+            ui = copy.deepcopy(m3["ui"])
+            ui["peak_cap_w"] = 4400
+            st, body = await post("config/save",
+                                  {"model": ui, "fingerprint": m3["fingerprint"]})
+            out["ui_nobase"] = (st, sup.options["price_service_token"])
+            # --- validate with the placeholder in: no 'too short', no echo
+            _, raw4 = await get("config/model?lang=en")
+            m4 = json.loads(raw4)
+            st, body = await post("config/validate", {"options": m4["options"]})
+            out["validate_placeholder"] = (st, json.loads(body)["problems"])
+            st, body = await post("config/validate", {"model": m4["ui"]})
+            out["validate_ui_placeholder"] = (st, json.loads(body)["problems"])
+            # --- a refused save (token too short) and a stale one
+            opts = copy.deepcopy(m4["options"])
+            opts["price_service_token"] = "short"
+            st, body = await post("config/save",
+                                  {"options": opts, "fingerprint": m4["fingerprint"]})
+            out["refused"] = (st, json.loads(body), sup.options["price_service_token"])
+            opts = copy.deepcopy(m4["options"])
+            opts["peak_cap_w"] = 4500
+            st, body = await post("config/save",
+                                  {"options": opts, "fingerprint": "not-current"})
+            out["stale"] = (st, json.loads(body))
+            # --- a refusal that is not about the token
+            opts = copy.deepcopy(m4["options"])
+            opts["max_w"] = -5
+            st, body = await post("config/save",
+                                  {"options": opts, "fingerprint": m4["fingerprint"]})
+            out["refused_other"] = (st, sup.options["price_service_token"],
+                                    sup.options["max_w"])
+            # --- a new value replaces
+            _, raw5 = await get("config/model?lang=en")
+            m5 = json.loads(raw5)
+            opts = copy.deepcopy(m5["options"])
+            opts["price_service_token"] = NEW_TOKEN
+            st, body = await post("config/save",
+                                  {"options": opts, "fingerprint": m5["fingerprint"]})
+            out["replaced"] = (st, sup.options["price_service_token"], body)
+            out["writes"] = len(sup.writes)
+    finally:
+        await runner.cleanup()
+    out["seen"] = seen
+    return out
+
+
+S = asyncio.run(scenario())
+
+print("1. the token is in no page and no JSON answer")
+check("GET /config (the classic page) has no token",
+      TOKEN not in S["page"] and NEW_TOKEN not in S["page"])
+check("GET /config/model has no token anywhere in its JSON",
+      TOKEN not in S["raw_model"])
+for key in ("options", "running", "ui"):
+    check(f"...and {key} shows the placeholder, not the token",
+          json.dumps(S["model"][key]).count(SECRET_SHOWN) >= 1
+          and TOKEN not in json.dumps(S["model"][key]))
+check("...the placeholder stands in the token's own place",
+      S["model"]["options"]["price_service_token"] == SECRET_SHOWN
+      and S["model"]["running"]["price_service_token"] == SECRET_SHOWN
+      and S["model"]["ui"]["price_service_token"] == SECRET_SHOWN)
+check("a site with no token shows it empty, so the page can say 'not set'",
+      S["model_unset"]["options"]["price_service_token"] == ""
+      and S["model_unset"]["ui"]["price_service_token"] == "")
+check("no answer the app gave in the whole run (page, model, validate, saves, "
+      "refusals, the stale one) holds the stored token",
+      not [t for t in S["seen"] if TOKEN in t])
+check("...nor the new token, after it was saved",
+      not [t for t in S["seen"] if NEW_TOKEN in t])
+
+print("\n2. the classic page draws it as a password field")
+check("the field model types it as a password",
+      [f["type"] for f in S["field"]] == ["password"])
+check("the classic page's script makes a password input for that type",
+      "'password'" in S["page"] and "input.type = 'password'" in S["page"])
+
+print("\n3. saves keep the stored token unless given a new one")
+st, tok, cap, body = S["classic_placeholder"]
+check("a classic save with the placeholder keeps the token and saves the "
+      "other edit", st == 200 and tok == TOKEN and cap == 4100)
+st, tok, cap = S["classic_empty"]
+check("a classic save with the field emptied keeps the token",
+      st == 200 and tok == TOKEN and cap == 4200)
+check("a classic save without the key keeps the token",
+      S["classic_absent"] == (200, TOKEN))
+check("a save from the new settings page keeps it (with a base)",
+      S["ui_base"] == (200, TOKEN))
+check("...and without a base", S["ui_nobase"] == (200, TOKEN))
+st, tok, body = S["replaced"]
+check("a new value replaces the token", st == 200 and tok == NEW_TOKEN)
+check("...and the answer to that save does not echo it",
+      NEW_TOKEN not in body)
+st, probs = S["validate_placeholder"]
+check("validate with the placeholder in sees the stored token: nothing about "
+      "the token is refused", st == 200 and not [p for p in probs if "token" in p])
+st, probs = S["validate_ui_placeholder"]
+check("...also from the new page's model",
+      st == 200 and not [p for p in probs if "token" in p])
+st, body, tok = S["refused"]
+check("a refused save (token too short) is 422, says why in short plain "
+      "words, and writes nothing",
+      st == 422 and tok == TOKEN
+      and any("too short" in p for p in body["problems"]))
+st, body = S["stale"]
+check("a stale refusal is 409 and its `stored` shows the placeholder",
+      st == 409 and body["stored"]["price_service_token"] == SECRET_SHOWN)
+check("a refusal about something else (422) writes nothing, so the token and "
+      "the rating stay",
+      S["refused_other"][0] == 422 and S["refused_other"][1] == TOKEN
+      and S["refused_other"][2] != -5)
+
+print("\n4. every password option, not only this name")
+other = [{"name": "mqtt_secret", "type": "string", "format": "password"},
+         {"name": "other_pw", "type": "password"},
+         {"name": "plain", "type": "string"}]
+keys = configui.secret_keys(other)
+check("a schema password is found in both spellings, a plain string is not",
+      keys == {"mqtt_secret", "other_pw"})
+check("the price token is counted by name too, in case a schema is missing",
+      configui.secret_keys([], price.SECRET_OPTIONS)
+      == frozenset(price.SECRET_OPTIONS) and "price_service_token" in
+      price.SECRET_OPTIONS)
+blob = {"mqtt_secret": "hunter2hunter2", "other_pw": "", "plain": "x",
+        "nested": [{"mqtt_secret": "deep-secret-value"}]}
+shown = configui.hide_secrets(blob, keys)
+check("hide_secrets: set -> placeholder, empty -> empty, other keys alone, "
+      "at any depth",
+      shown == {"mqtt_secret": SECRET_SHOWN, "other_pw": "", "plain": "x",
+                "nested": [{"mqtt_secret": SECRET_SHOWN}]}
+      and blob["mqtt_secret"] == "hunter2hunter2")
+back = configui.keep_secrets({"mqtt_secret": SECRET_SHOWN, "other_pw": "new",
+                              "plain": "y"}, blob, keys)
+check("keep_secrets: the placeholder gives the stored value, a new value "
+      "stays",
+      back["mqtt_secret"] == "hunter2hunter2" and back["other_pw"] == "new"
+      and back["plain"] == "y")
+check("keep_secrets: a placeholder with nothing stored is never saved as "
+      "the placeholder",
+      configui.keep_secrets({"mqtt_secret": SECRET_SHOWN}, {}, keys)
+      ["mqtt_secret"] == "")
+
+
+async def other_option_scenario():
+    """A second password option, found from the schema, is hidden and kept."""
+    schema = SCHEMA + [{"name": "extra_secret", "type": "string",
+                        "format": "password", "required": False,
+                        "optional": True}]
+    sup = Sup(dict(SITE, extra_secret="extra-secret-value-12345"), schema)
+    runner, root = await serve(sup)
+    try:
+        async with ClientSession() as s:
+            async with s.get(root + "config/model?lang=en") as r:
+                raw = await r.text()
+            m = json.loads(raw)
+            opts = copy.deepcopy(m["options"])
+            opts["peak_cap_w"] = 4100
+            async with s.post(root + "config/save", json={
+                    "options": opts, "fingerprint": m["fingerprint"]}) as r:
+                st = r.status
+            return raw, st, sup.options.get("extra_secret")
+    finally:
+        await runner.cleanup()
+
+
+_raw, _st, _kept = asyncio.run(other_option_scenario())
+check("a password option the add-on has no name for is hidden from the model",
+      "extra-secret-value-12345" not in _raw)
+check("...and kept by a save that sends the placeholder",
+      _st == 200 and _kept == "extra-secret-value-12345")
+
+async def named_scenario():
+    """A schema that does not call the token a password (a Supervisor that
+    spells it another way): the add-on still hides it, by name."""
+    schema = [dict(n, format=None) if n["name"] == "price_service_token" else n
+              for n in SCHEMA]
+    sup = Sup(SITE, schema)
+    runner, root = await serve(sup)
+    try:
+        async with ClientSession() as s:
+            async with s.get(root + "config/model?lang=en") as r:
+                return await r.text()
+    finally:
+        await runner.cleanup()
+
+
+check("the price token is hidden by name even when the schema does not mark "
+      "it as a password", TOKEN not in asyncio.run(named_scenario()))
+
+print("\n5. PRICE-01 round 3: the fixed-tariff note on the real validate route")
+_PROFILE = json.dumps({"periods": [
+    {"name": "all", "days": "all", "from": "00:00", "to": "24:00",
+     "eur_per_kwh": 0.25}]})
+_NOTE = {"en": ("With the price service, the fixed tariff is only used if no "
+                "prices are available."),
+         "nl": ("Met de prijsdienst wordt het vaste tarief alleen gebruikt als "
+                "er geen prijzen zijn.")}
+
+
+async def note_scenario(site):
+    runner, root = await serve(Sup(site))
+    out = {}
+    try:
+        async with ClientSession() as s:
+            for lang in ("en", "nl"):
+                async with s.get(root + f"config/model?lang={lang}") as r:
+                    m = await r.json()
+                async with s.post(root + "config/validate",
+                                  json={"model": m["ui"], "lang": lang}) as r:
+                    b = await r.json()
+                out[lang] = [x for x in b.get("messages", [])
+                             if x["text"] in _NOTE.values()]
+    finally:
+        await runner.cleanup()
+    return out
+
+
+_with = asyncio.run(note_scenario(dict(SITE, static_profile=_PROFILE)))
+check("an English page gets the note in English, as info, beside a field",
+      [(x["text"], x["tier"]) for x in _with["en"]] == [(_NOTE["en"], "info")]
+      and _with["en"][0]["field"])
+check("...and a Dutch page gets it in Dutch, beside the same field",
+      [(x["text"], x["tier"]) for x in _with["nl"]] == [(_NOTE["nl"], "info")]
+      and _with["nl"][0]["field"] == _with["en"][0]["field"])
+_blank = asyncio.run(note_scenario(dict(SITE, static_profile="   ")))
+check("a spaces-only fixed tariff: no note on either page",
+      _blank == {"en": [], "nl": []})
+
+print("\n6. the shipped config.yaml")
+cfg = open(os.path.join(HERE, "config.yaml"), encoding="utf-8").read()
+schema_text = cfg[cfg.index("\nschema:"):]
+pw = {line.split(":")[0].strip() for line in schema_text.splitlines()
+      if line.split(":", 1)[-1].strip().rstrip("?") == "password"}
+check(f"every password option of config.yaml is counted as a secret ({sorted(pw)})",
+      pw and pw <= configui.secret_keys(SCHEMA, price.SECRET_OPTIONS))
+
+print()
+if fails:
+    print(f"{len(fails)} FAILED: " + "; ".join(fails))
+    sys.exit(1)
+print("all checks passed")

goodwe_controller/test_safety81.py

@@ -57,6 +57,28 @@ BASE = {
     "twice7000": ([1001.0, 1502.0, 2699.0], "1cddda8cf35859efb2ad503f1683f744cb812a6325a390c4fa3df19d717af043"),
     "step6500_gap": ([1201.0, 1801.0], "95e5c90e4a6814526cb4f3bea76286063b449d86a420f888c014531fb6e913a3"),
 }
+# OPT-15: with battery modes ON the guard no longer reads "no seconds left" on
+# a quarter's edge tick (it projects the quarter it is in), so the 1 s 0 W
+# command at each edge is gone and every run differs from 5a4cdc2's. Printed by
+# `python3 tools/safety81_sim.py` on the OPT-15 head (BASE above stays as the
+# reference). Modes OFF stays byte-identical (section 1b).
+OPT15 = {
+    "const4500": "ed2f4ef9a74172ada2f00707a09ad839743449642f61dc6583ace44bac33caf4",
+    "const4500_m0": "63d4d62643b9d39697b16078603576d180d90090117a497122e77c33f3db2227",
+    "sine4500": "a034af0a896d55552915f1e4816055e26c006d4df0a86d1c9d9c3a625faf747f",
+    "edge4600": "74e03c7182469715c1517765c2f53f1d68d7342aed4a8ad388878eac24964020",
+    "edge4600_m0": "93e4402b6b879a44da5ecc28fb3b51b16c0b0f701396e00a9703803273dbd18e",
+    "burst_end": "8dc4001e06ad8fa562caea02d755227cdfa16396708fa986aef7a5704e22a691",
+    "noise5000_m50": "71e29a970837211835e56636280c29f70d7c2d3f3062cfac2b940ea30fa66424",
+    "noise5000_m0": "a47988b7bbee629a6f8722588f325a4c87d7dcb143bba549b6df452664b30251",
+    "step6500": "a7356fe0f8c00ac4d16dd4f60b054af7336ceb2eedcd76911d30138df4b457b8",
+    "miss5560": "2b0afb600fe1cfd0bfe4b28fbfeeff73fc7e875e3d5f377ae7c2a489e20abf53",
+    "ramp6500": "ae3838aa8f2af9458f73b540eeb76cb5fa25ace0f1ea06df2b4f6d9201907522",
+    "step7500_reserve": "21eb9c07a4582f47f347084d1c75a28a5d767bc068bc3f74f32433d3239e9ccb",
+    "sine4500_fast": "47ed9d02a4f7afbc50905f44519b14364f262ba793aae80f3cd077eb6f600b8b",
+    "twice7000": "b89396022f589bbb90bc592ece121cf2a0bf3a4f04316da36891ac1a2b6ae18e",
+    "step6500_gap": "a7356fe0f8c00ac4d16dd4f60b054af7336ceb2eedcd76911d30138df4b457b8",
+}
 OUT = {k: sim.run(**v) for k, v in sim.SCENARIOS.items()}
 RUN = {k: v[:2] for k, v in OUT.items()}
 ERR = {k: v[4] for k, v in OUT.items()}
@@ -65,7 +87,23 @@ ERR = {k: v[4] for k, v in OUT.items()}
 print("1. every command byte-identical to release/1.0 5a4cdc2")
 check("the same scenarios as 5a4cdc2", set(RUN) == set(BASE))
 for k, (alarms, digest) in RUN.items():
-    check(f"{k}: digest {digest[:12]}", digest == BASE[k][1])
+    check(f"{k}: digest {digest[:12]} (OPT-15 pin; modes off in 1b)",
+          digest == OPT15[k])
+
+# ============================================================================ #
+print("1b. battery modes off: every command byte-identical to release/1.0 e3e4ba6")
+# Printed on e3e4ba6 (this sim copied in, `modes=False`), in the CI image.
+OFF = {
+    "const4500": "719d8bfa450710d9c0c22282d17ea4ab9945b1cb53ce344084e5ff906ca027b3",
+    "edge4600": "4f8f943f5a4e9b218c2e8bc6a95d20934ec19f1bebfbdc5748ca52e753e5afa0",
+    "step6500": "719d8bfa450710d9c0c22282d17ea4ab9945b1cb53ce344084e5ff906ca027b3",
+    "burst_end": "4ca4ba895afe7dacfe3952743e13d21607e690dfec39029fd5c5745fe03af5d7",
+    "twice7000": "719d8bfa450710d9c0c22282d17ea4ab9945b1cb53ce344084e5ff906ca027b3",
+    "sine4500_fast": "3e41ad417880a4ebb63ae3d6826f413fb779c18dfb677207775b1c980133423f",
+}
+for k, want in OFF.items():
+    digest = sim.run(modes=False, **sim.SCENARIOS[k])[1]
+    check(f"{k} (modes off): digest {digest[:12]}", digest == want)
 
 # ============================================================================ #
 print("2. no false alarm (5a4cdc2's are listed)")
@@ -76,16 +114,17 @@ for k in ("edge4600", "edge4600_m0", "const4500", "const4500_m0", "sine4500",
 # ============================================================================ #
 print("3. real overloads still alarm, ALARM_HOLD_S after 5a4cdc2")
 # ALARM_HOLD_S (10 s) plus up to 2 s of late meter samples; at 1800 s the
-# quarter-edge tick restarts the hold.
-for k, want in (("step6500", [1211.0, 1813.0]),
-                ("miss5560", [1213.0, 1813.0])):
+# quarter-edge tick restarts the hold (OPT-15: with modes on, by not grading
+# a projection that rolled into the new quarter before its first sample).
+for k, want in (("step6500", [1211.0, 1811.0]),
+                ("miss5560", [1213.0, 1811.0])):
     print(f"    {k}: load steps up at 1200 s; alarms at {RUN[k][0]}, "
           f"5a4cdc2 {BASE[k][0]}")
     check(f"{k}: after the hold, and again only at the next quarter",
           RUN[k][0] == want)
 check("step6500_gap: cycles stopped by a lost battery reading do not "
       "restart the hold",
-      RUN["step6500_gap"][0] == [1215.0, 1813.0])
+      RUN["step6500_gap"][0] == [1215.0, 1811.0])
 check("twice7000: notified once in the quarter (5a4cdc2: "
       f"{BASE['twice7000'][0]})", RUN["twice7000"][0] == [1011.0])
 check("twice7000: the ERROR line for both overloads",
@@ -96,7 +135,7 @@ print(f"    ramp6500: alarms at {RUN['ramp6500'][0]}, "
       f"5a4cdc2 {BASE['ramp6500'][0]}")
 check("ramp6500: alarms once the quarter will end over the real cap by "
       "more than ALARM_MISS_W",
-      RUN["ramp6500"][0] == [1316.0, 1813.0])
+      RUN["ramp6500"][0] == [1317.0, 1811.0])
 check("step7500 under the peak reserve: not this alarm (the guard is not "
       "allowed to discharge)", RUN["step7500_reserve"][0] == [])
 
@@ -150,6 +189,7 @@ stub = SimpleNamespace(
                                reason="PEAK_GUARD: fixture"),
     site_rating_w=2000.0, shadow=False, events=[],
     _peak_batt_prev=None, _peak_alarm_block=None, _peak_high_since=None,
+    _peak_rolled=False,
     _peak_saturated=False, hass=SimpleNamespace(call=_call),
     log_event=lambda msg, hint=None: None)
 first = None

goodwe_controller/test_setup_only.py

@@ -454,7 +454,11 @@ check("the saved blob passes the normal gate: no refusal, not setup-only",
 
 print("\n    after the restart, on the saved settings:")
 rc, ev, err, files = run_child("after", SAVED or {}, SAVED_STATE)
-services = [e for e in ev if e[0] == "SERVICE"]
+# Not the dismiss of PRICE-01's old fixed-tariff card, sent at every start.
+# Only that dismiss: a `create` with the old id would still be counted.
+services = [e for e in ev if e[0] == "SERVICE"
+            and not (e[1:3] == ["persistent_notification", "dismiss"]
+                     and e[3].get("notification_id") == "goodwe_fixed_tariff_unused")]
 writes = [e[3].get("value") for e in services
           if e[1:3] == ["number", "set_value"]]
 print(f"    after: exit {rc}, {len(services)} service calls, set_value "

goodwe_controller/test_watchdog.py

@@ -1111,8 +1111,17 @@ check("...carrying the reason with it, so the operator who has to decide "
 check("...and it is still commanding 0 W on the far side of the restart",
       _b.target == 0.0 and "circulation" in _b.reason)
 
-_notes1 = [c for c in _h1.calls if c[0] == "persistent_notification"]
-_notes2 = [c for c in _h2.calls if c[0] == "persistent_notification"]
+# Not the dismiss of PRICE-01's old fixed-tariff card, sent at every start.
+# Only that dismiss: a `create` with the old id would still be counted.
+def _not_old_dismiss(c):
+    return not (c[1] == "dismiss"
+                and c[2].get("notification_id") == "goodwe_fixed_tariff_unused")
+
+
+_notes1 = [c for c in _h1.calls if c[0] == "persistent_notification"
+           and _not_old_dismiss(c)]
+_notes2 = [c for c in _h2.calls if c[0] == "persistent_notification"
+           and _not_old_dismiss(c)]
 print(f"       notifications raised: {len(_notes1)} before the restart, "
       f"{len(_notes2)} after it")
 check("the alarm was raised in the first process", len(_notes1) >= 1)

goodwe_controller/tools/opt11p3_identity.py

@@ -19,12 +19,14 @@ import hashlib
 import os
 import sys
 import tempfile
+import time
 from datetime import timedelta
 
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 
 import opt11_identity as rig                               # noqa: E402
 import safety79_identity as s79                            # noqa: E402
+from app.p1 import make_sample, split_signed               # noqa: E402
 from app.price import PricePoint, PriceProduct, PriceRead, brussels  # noqa
 from app.static_tariff import TariffPlan                   # noqa: E402
 
@@ -53,6 +55,21 @@ def _feed(c, t):
     s79._feed(c, t)
 
 
+# OPT-15: the P1 sample of each cycle is built this long after the cycle
+# reads the grid (the HA source's debounce), so the cycle on a quarter
+# boundary still sees the old block, as on TEST-23.
+P1_LAG_S = 0.35
+
+
+def _feed_lag(c, t):
+    c.tariff_plan, c.tariff_at = PLAN, rig.BASE + timedelta(seconds=t)
+    imp, exp = split_signed(c.hass.grid())
+    c.p1.submit(make_sample(
+        "ha_signed", imp, exp, phases=1,
+        ingest_ts=rig.BASE + timedelta(seconds=t - P1_LAG_S),
+        ingest_mono=time.monotonic()))
+
+
 def load(t):
     """Under the limit, over it, a surplus, a big evening load."""
     k = int(t // 600) % 5
@@ -70,10 +87,13 @@ SCENARIOS = {
     # The option present and false: an install that saved it off.
     "n1_off": dict(n=1, extra={"battery_modes_enabled": False}),
     "n2_off": dict(n=2, extra={"battery_modes_enabled": False}),
+    # OPT-15: every quarter boundary with the old block still open.
+    "n1_lag": dict(n=1, lag=True),
+    "n2_lag": dict(n=2, lag=True),
 }
 
 
-def run(n, *, extra=None, dur=DUR):
+def run(n, *, extra=None, dur=DUR, lag=False):
     opts = dict(s79.P1, **ARB, **(extra or {}))
     trade = []
 
@@ -85,7 +105,8 @@ def run(n, *, extra=None, dur=DUR):
     rig.Controller = functools.partial(real, peak_db_path=db)
     try:
         rows, c = rig.run(n, extra=opts, dur=dur, load=load, soc=soc,
-                          cut=lambda u, t: False, before=_feed,
+                          cut=lambda u, t: False,
+                          before=_feed_lag if lag else _feed,
                           on_cycle=on_cycle)
     finally:
         rig.Controller = real

goodwe_controller/tools/opt11p3_replay.py

@@ -18,7 +18,11 @@ earlier (364 days), or the captured quarter-hourly energy-charts bodies for
 2026-09-09/10), the decision code.
 MODELLED: the batteries (a first-order lag, 3 s, 800 W/s ramp, SoC
 integrated, 95 % each way, a reading that jitters by a few watts, and
-optionally a device limit or a refusal to charge), the all-in price (the EPEX file's own stated
+optionally a device limit or a refusal to charge). By default the readings
+are instantaneous and the loop runs every 5 s, which hides what the loop
+does on readings a second or two old; `lag=Lag(...)` (OPT-15) adds a command
+dead time, a meter and battery reading age, the P1 sample's debounce and a
+1 s cycle, as on TEST-23. The all-in price (the EPEX file's own stated
 assumption: (wholesale + 0.02 + 0.10) x 1.06), export paid at the wholesale
 price, tomorrow's prices known from 13:00 local. The absolute money is
 therefore an estimate; the comparison between variants is the point.
@@ -104,10 +108,28 @@ def qh_points():
             if p is not None]
 
 
+class Lag:
+    """OPT-15: how old what the add-on reads is, and how often it acts.
+    `dead_s` a command takes effect that late; `meter_s` / `batt_s` the age
+    of the grid and battery readings; `p1_s` a P1 sample is built that long
+    after the reading (the HA source's debounce), so a cycle just after a
+    quarter boundary can still see the old block; `tick` the cycle period;
+    `tau_s` / `ramp_w_s` the battery's own lag (TEST-23's plant: `dead_s` 1,
+    no lag or ramp)."""
+
+    def __init__(self, dead_s=1.0, meter_s=1.0, batt_s=1.0, p1_s=0.35,
+                 tick=1.0, sub=0.25, tau_s=3.0, ramp_w_s=800.0):
+        self.dead_s, self.meter_s, self.batt_s = dead_s, meter_s, batt_s
+        self.p1_s, self.tick, self.sub = p1_s, tick, sub
+        self.tau_s, self.ramp_w_s = tau_s, ramp_w_s
+
+
 class Plant:
     def __init__(self, soc, refuse_charge=False):
         self.cmd, self.p, self.soc = 0.0, 0.0, float(soc)
         self.refuse_charge = refuse_charge
+        self.queue = []                 # (t, command) not yet in effect
+        self.tau, self.ramp = 3.0, 800.0
 
     def step(self, dt, floor):
         c = self.cmd
@@ -115,8 +137,8 @@ class Plant:
             c = 0.0
         if c < 0 and (self.soc >= 100.0 or self.refuse_charge):
             c = 0.0
-        want = self.p + (c - self.p) * (1 - math.exp(-dt / 3.0))
-        dp = max(-800.0 * dt, min(800.0 * dt, want - self.p))
+        want = self.p + (c - self.p) * (1 - math.exp(-dt / self.tau))
+        dp = max(-self.ramp * dt, min(self.ramp * dt, want - self.p))
         self.p += dp
         e = self.p * dt / 3600.0 / 1000.0            # kWh, + = out
         eff = 1 / 0.95 if e > 0 else 0.95
@@ -125,17 +147,52 @@ class Plant:
 
 
 class Hass:
-    def __init__(self, units, house_at, soc0=None, refuse=(), limits=None):
+    def __init__(self, units, house_at, soc0=None, refuse=(), limits=None,
+                 lag=None):
         self.units = units
         self.lim = limits or {}
         self.plants = {u: Plant((soc0 or {}).get(u, 50.0), u in refuse)
                        for u in units}
         self.house_at = house_at
         self.t = 0.0
+        self.lag = lag
+        self.hist = []                  # (t, grid, {unit: p}), with `lag`
+        for p in self.plants.values():
+            if lag is not None:
+                p.tau, p.ramp = lag.tau_s, lag.ramp_w_s
 
     def grid(self):
         return self.house_at(self.t) - sum(p.p for p in self.plants.values())
 
+    def _past(self, age):
+        """(grid, {unit: p}) as they were `age` seconds ago."""
+        want = self.t - age
+        for t, g, ps in reversed(self.hist):
+            if t <= want + 1e-9:
+                return g, ps
+        return self.hist[0][1:] if self.hist else (self.grid(), {
+            u: p.p for u, p in self.plants.items()})
+
+    def advance(self, dt, floor):
+        """Step the plant `dt` seconds (with `lag`: in `sub` steps, commands
+        applied after `dead_s`, history kept for the lagged readings)."""
+        lag = self.lag
+        if lag is None:
+            for p in self.plants.values():
+                p.step(dt, floor)
+            return
+        end = self.t + dt
+        while self.t < end - 1e-9:
+            h = min(lag.sub, end - self.t)
+            for p in self.plants.values():
+                while p.queue and p.queue[0][0] <= self.t + 1e-9:
+                    p.cmd = p.queue.pop(0)[1]
+                p.step(h, floor)
+            self.t += h
+            self.hist.append((self.t, self.grid(),
+                              {u: p.p for u, p in self.plants.items()}))
+        del self.hist[:-200]
+
     async def limits(self, e):
         lo, hi = self.lim.get(e[-1], (-5000.0, 5000.0))
         return (lo, hi, 1.0)
@@ -145,7 +202,8 @@ class Hass:
 
     async def number(self, e, invert=False):
         if e == "sensor.grid":
-            return self.grid()
+            return self.grid() if self.lag is None else \
+                self._past(self.lag.meter_s)[0]
         u = e[-1]
         if e.startswith("sensor.soc"):
             return round(self.plants[u].soc, 1)
@@ -153,11 +211,17 @@ class Hass:
             # A real reading jitters by a few watts; a dead-flat one is a
             # stale register to the add-on (SAFETY-37), which is not modelled.
             j = (ord(u) * 31 + int(self.t)) % 7 - 3
-            return float(round(self.plants[u].p) + j)
+            p = self.plants[u].p if self.lag is None else \
+                self._past(self.lag.batt_s)[1][u]
+            return float(round(p) + j)
         return None
 
     async def set_number(self, e, v):
-        self.plants[e[-1]].cmd = float(v)
+        p = self.plants[e[-1]]
+        if self.lag is None:
+            p.cmd = float(v)
+        else:
+            p.queue.append((self.t + self.lag.dead_s, float(v)))
         return True
 
 
@@ -239,7 +303,7 @@ def plan_at(now, pts):
 
 def run(variant, house, pts, start, dur, *, check=None, stride=1, n=2,
         soc0=None, refuse=(), extra=None, choice=None, patch=None,
-        limits=None):
+        limits=None, lag=None):
     modes, arb, var_choice = VARIANTS[variant]
     choice = var_choice if choice is None else choice
     units = tuple("ab"[:n])
@@ -272,7 +336,8 @@ def run(variant, house, pts, start, dur, *, check=None, stride=1, n=2,
                  ticks=0, quarters={}, trade_ticks=0)
 
     async def go():
-        hass = Hass(units, house_at, soc0, refuse, limits)
+        hass = Hass(units, house_at, soc0, refuse, limits, lag)
+        tick = TICK if lag is None else lag.tick
         import tempfile
         db = os.path.join(tempfile.mkdtemp(prefix="p3r-"), "tariff.db")
         c = Controller(dict(options(modes, arb, n), **(extra or {})), hass,
@@ -299,6 +364,8 @@ def run(variant, house, pts, start, dur, *, check=None, stride=1, n=2,
                 now = start + timedelta(seconds=t)
                 hass.t = t
                 clock[0] = now
+                if lag is not None and not hass.hist:
+                    hass.advance(0.0, 10.0)
                 if plan_hour != now.replace(minute=0, second=0,
                                             microsecond=0):
                     plan_hour = now.replace(minute=0, second=0,
@@ -306,17 +373,25 @@ def run(variant, house, pts, start, dur, *, check=None, stride=1, n=2,
                     c.tariff_plan, c.tariff_at = plan_at(now, pts), now
                 else:
                     c.tariff_at = now
-                imp, exp = split_signed(hass.grid())
-                c.p1.submit(make_sample("ha_signed", imp, exp, phases=1,
-                                        ingest_ts=now,
-                                        ingest_mono=time.monotonic()))
+                if lag is None:
+                    imp, exp = split_signed(hass.grid())
+                    c.p1.submit(make_sample("ha_signed", imp, exp, phases=1,
+                                            ingest_ts=now,
+                                            ingest_mono=time.monotonic()))
+                elif t >= lag.p1_s:
+                    # The sample of the reading one debounce ago.
+                    imp, exp = split_signed(hass._past(
+                        lag.meter_s + lag.p1_s)[0])
+                    c.p1.submit(make_sample(
+                        "ha_signed", imp, exp, phases=1,
+                        ingest_ts=now - timedelta(seconds=lag.p1_s),
+                        ingest_mono=time.monotonic()))
                 await c.read_inputs(now_mono=t)
                 await c.cycle()
-                for p in hass.plants.values():
-                    p.step(TICK, 10.0)
+                hass.advance(tick, 10.0)
                 g = hass.grid()
                 pr = price_at(now)
-                dt_h = TICK / 3600.0
+                dt_h = tick / 3600.0
                 if g > 0:
                     stats["imp_kwh"] += g / 1000 * dt_h
                     stats["cost"] += g / 1000 * dt_h * (all_in(pr) if pr
@@ -339,7 +414,7 @@ def run(variant, house, pts, start, dur, *, check=None, stride=1, n=2,
                 stats["ticks"] += 1
                 if check is not None:
                     check(c, hass, now, pr)
-                t += TICK
+                t += tick
         finally:
             m.datetime = real_dt
         return c

goodwe_controller/tools/opt20_scen.py

@@ -0,0 +1,160 @@
+"""OPT-20: the refusal-probe scenarios, on the REAL Controller in the lagged
+replay (tools/opt11p3_replay.py). Uses only the API bf9019e has, so the same
+file runs on both trees (test_opt20.py pins the digests printed on bf9019e).
+
+Battery B is Cheap hours and refuses to charge; it is probed every 15 minutes
+inside the cheap run (OPT-15). A is, per scenario, in its maintenance charge
+phase, idle (Solar first), or a normal charger in the same run.
+"""
+
+import hashlib
+import logging
+import os
+import sys
+from datetime import datetime, timedelta, timezone
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+sys.path.insert(0, HERE)
+sys.path.insert(0, os.path.dirname(HERE))
+logging.disable(logging.WARNING)
+
+import opt11p3_replay as rp                                    # noqa: E402
+from app import packmode                                       # noqa: E402
+from app.maintenance import CHARGE, DRAIN, MaintResult         # noqa: E402
+
+L = timezone(timedelta(hours=2))
+A, B = "inverter-a", "inverter-b"
+LAG = rp.Lag(tau_s=0.05, ramp_w_s=1e9)
+SF_CH = {"a": (True, packmode.SOLAR_FIRST, False),
+         "b": (True, packmode.CHEAP_HOURS, False)}
+CH_CH = {"a": (True, packmode.CHEAP_HOURS, False),
+         "b": (True, packmode.CHEAP_HOURS, False)}
+
+# A day of the owner's kind: cheap 02:00-04:00 local, flat otherwise.
+D0 = datetime(2026, 9, 9, 0, 0, tzinfo=L)
+UTC0 = D0.astimezone(timezone.utc)
+_PR = [0.30] * 192
+for _i in range(8, 16):
+    _PR[_i] = 0.10
+WPTS = [(UTC0 + timedelta(minutes=15 * i), 900, p) for i, p in enumerate(_PR)]
+
+# OPT-15 rig g7: prices 0 from 17:45 to 18:45 local, flat 0.06 otherwise.
+G0 = datetime(2026, 10, 13, 0, 0, tzinfo=L)
+GUTC0 = G0.astimezone(timezone.utc)
+_GP = [0.06] * 192
+for _i in range(71, 75):
+    _GP[_i] = 0.0
+for _i in range(76, 78):
+    _GP[_i] = 0.5
+G7PTS = [(GUTC0 + timedelta(minutes=15 * i), 900, p)
+         for i, p in enumerate(_GP)]
+
+
+def at(h, base=UTC0):
+    return base + timedelta(hours=h)
+
+
+def _rows(rows):
+    def cb(c, h, now, pr):
+        sh = dict(c.allocation.shares) if c.allocation is not None \
+            and c.allocation.shares else {}
+        rows.append(dict(
+            now=now, grid=h.grid(), shares=sh,
+            action=getattr(c.arb, "action", None),
+            reason=getattr(c.arb, "reason", None) or "",
+            probing=c.inverters[1].probe_from is not None,
+            roles=dict(c.mode_tick.roles) if c.mode_tick else {},
+            p={u: p.p for u, p in h.plants.items()}))
+    return cb
+
+
+def day(choice, *, a_maint=None, shaped=False, refuse=("b",), hours=0.5,
+        house_w=800.0):
+    """02:00..: a cheap run, `house_w` house. `a_maint` is A's forced maintenance
+    result from 5 minutes in (B's refusal stands by then); `shaped` closes the
+    maintenance charge's own watts (charge-only shaping, hi = 0)."""
+    rows = []
+
+    def patch(c):
+        if shaped:
+            c._charge_headroom = lambda floor, claims: 0.0
+        if a_maint is None:
+            return
+        m, real = c.maints[0], c.maints[0].tick
+
+        def tick(now, soc, blocked_by=None, gate_open=True):
+            if now >= at(1.9 + 5 / 60):
+                return a_maint
+            return real(now, soc, blocked_by=blocked_by, gate_open=gate_open)
+        m.tick = tick
+    rp.run("p3_ch_sell", [(UTC0.timestamp() - 10, house_w)], WPTS, at(1.9),
+           3600 * hours, check=_rows(rows), lag=LAG, n=2,
+           soc0={"a": 50.0, "b": 30.0}, choice=choice, refuse=refuse,
+           patch=patch, extra={"cycle_cost_threshold_eur": 0.10})
+    return rows
+
+
+def g7():
+    """The OPT-15 rig's g7: B refuses from the start of the cheap run, A
+    drains 18:00 to 18:17:04 and then sits in its maintenance charge phase
+    (charge-only) at 0 W. The probe after the drain used to put the trade's
+    2500 W on A."""
+    rows = []
+    t_end = at(18 + 17 / 60 + 4 / 3600, GUTC0)
+
+    def patch(c):
+        m, real = c.maints[0], c.maints[0].tick
+
+        def tick(now, soc, blocked_by=None, gate_open=True):
+            if at(18.0, GUTC0) <= now < t_end:
+                return MaintResult(DRAIN, True, 2000.0, False, [])
+            if now >= t_end:
+                return MaintResult(CHARGE, False, None, True, [])
+            return real(now, soc, blocked_by=blocked_by, gate_open=gate_open)
+        m.tick = tick
+    rp.run("p3_ch_sell", [(GUTC0.timestamp() - 10, 800.0)], G7PTS,
+           at(17.6, GUTC0), 3600 * 1.1, check=_rows(rows), lag=LAG, n=2,
+           soc0={"a": 17.0, "b": 73.0}, choice=SF_CH, refuse=("b",),
+           patch=patch, extra={"cycle_cost_threshold_eur": 0.10})
+    return rows
+
+
+MAINT_CHARGE = MaintResult(CHARGE, False, None, True, [])
+
+
+def windows(rows):
+    """[(first, last)] row indexes of each probe window."""
+    out, i = [], 0
+    while i < len(rows):
+        if rows[i]["probing"]:
+            j = i
+            while j + 1 < len(rows) and rows[j + 1]["probing"]:
+                j += 1
+            out.append((i, j))
+            i = j + 1
+        else:
+            i += 1
+    return out
+
+
+def digest(rows) -> str:
+    keep = [(r["now"].isoformat(), sorted(r["shares"].items()),
+             round(r["grid"], 3), r["action"], r["reason"],
+             sorted(r["roles"].items()), sorted(r["p"].items()))
+            for r in rows]
+    return hashlib.sha256(repr(keep).encode()).hexdigest()
+
+
+def no_probe_digests() -> dict:
+    """Battery modes on, no refusal, so no probe: a scripted cheap run."""
+    return {
+        "sf_ch": digest(day(SF_CH, refuse=(), hours=1.2)),
+        "ch_ch": digest(day(CH_CH, refuse=(), hours=1.2)),
+        "ch_ch_maint": digest(day(CH_CH, a_maint=MAINT_CHARGE, refuse=(),
+                                  hours=1.2)),
+    }
+
+
+if __name__ == "__main__":
+    for k, v in no_probe_digests().items():
+        print(k, v)

goodwe_controller/tools/safety81_sim.py

@@ -119,15 +119,15 @@ class _Plant:
 
 
 def run(load, *, margin=50, dur=2700.0, rating=2000.0, cap=3500.0,
-        late_at=(), soc=60.0, batt_gap=()):
+        late_at=(), soc=60.0, batt_gap=(), modes=True):
     """Alarm times (s from the start of the first quarter), a digest of every
     cycle's target and written command, the Controller, the rows, and the
     times of the ERROR log line. A sample is also late at each `t % 900` in
-    `late_at`."""
+    `late_at`. `modes=False` (OPT-15) runs with battery modes off."""
     opts = rig._options(1, {
         "meter_source": "ha_signed", "p1_net_entity": "sensor.net",
         "meter_phases": 1, "peak_cap_w": cap, "peak_margin_w": margin,
-        "battery_modes_enabled": True, "max_w": rating})
+        "battery_modes_enabled": modes, "max_w": rating})
     store = rig._Store()
     store.data[unit_key("inverter-a", packmode.USE_KEY)] = False
     store.data[packmode.USE_KEY] = False

goodwe_controller/tools/ux13_demo.py

@@ -141,6 +141,8 @@ def _node(name, spec):
                    lengthMin=float(m.group(2)), lengthMax=float(m.group(3)))
     elif spec.startswith("list("):
         out.update(type="select", options=spec[5:-1].split("|"))
+    elif spec == "password":
+        out.update(type="string", format="password")
     elif spec in ("bool",):
         out["type"] = "boolean"
     elif spec in ("int", "float"):

goodwe_controller/translations/en.yaml

@@ -199,6 +199,9 @@ configuration:
   price_feed_url:
     name: "Tariff · Price feed URL override"
     description: "Leave it empty to use the source's own feed. An override is sent exactly as typed and often returns only one day."
+  price_service_token:
+    name: "Tariff · Price service token"
+    description: "For the price service only. The token you were given for it. Leave it empty with any other price source."
   price_horizon_h:
     name: "Tariff · Price look-ahead (hours)"
     description: "How many hours of prices to ask the source for."

goodwe_controller/translations/nl.yaml

@@ -180,6 +180,9 @@ configuration:
   price_feed_url:
     name: "Tarief · Afwijkende URL voor de prijsfeed"
     description: "Laat leeg om de eigen feed van de bron te gebruiken. Een afwijkende URL wordt letterlijk verstuurd en geeft vaak maar één dag terug."
+  price_service_token:
+    name: "Tarief · Token van de prijsdienst"
+    description: "Alleen voor de prijsdienst. Het token dat u ervoor kreeg. Laat leeg bij een andere prijsbron."
   price_horizon_h:
     name: "Tarief · Prijzen vooruit (uren)"
     description: "Hoeveel uur aan prijzen de add-on bij de bron opvraagt."