From ebd44fd50351180ab5a547b247d33c3143563bee Mon Sep 17 00:00:00 2001
From: Fredrik Ahlgren <fredrik@sourceful-labs.com>
Date: Sun, 27 Sep 2026 17:07:26 +0200
Subject: [PATCH 1/2] fix(ev): allow battery boost during Charge now

---
 .changeset/boost-during-charge-now.md |  5 +++++
 src/views/EvPanel.svelte              |  4 +---
 src/views/EvPanel.svelte.test.ts      | 31 ++++++++++++++++++++++-----
 3 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/boost-during-charge-now.md

diff --git a/.changeset/boost-during-charge-now.md b/.changeset/boost-during-charge-now.md
new file mode 100644
index 0000000..5819ba1
--- /dev/null
+++ b/.changeset/boost-during-charge-now.md
@@ -0,0 +1,5 @@
+---
+"ftw-webapp": patch
+---
+
+Offer home battery boost while Charge now runs, matching Core's rules. Starting either keeps the other active, and stopping the boost leaves Charge now running.
diff --git a/src/views/EvPanel.svelte b/src/views/EvPanel.svelte
index 3f6800e..8068537 100644
--- a/src/views/EvPanel.svelte
+++ b/src/views/EvPanel.svelte
@@ -803,9 +803,7 @@
             {:else}
               <div class="row">
                 <span class="label">Battery boost</span>
-                {#if lp.manualActive}
-                  <span class="hint">Available after returning to the plan.</span>
-                {:else if surplusFor(lp)}
+                {#if surplusFor(lp)}
                   <span class="hint">Not while the charger uses spare solar only.</span>
                 {:else}
                   <button class="quiet edit" onclick={() => beginBoost(lp)}>
diff --git a/src/views/EvPanel.svelte.test.ts b/src/views/EvPanel.svelte.test.ts
index ba498e1..513da55 100644
--- a/src/views/EvPanel.svelte.test.ts
+++ b/src/views/EvPanel.svelte.test.ts
@@ -905,16 +905,37 @@ describe('the charger behind its bubble', () => {
     expect(button('Boost from the house battery')).toBeDefined()
   })
 
-  it('does not offer a boost while a manual charge runs, and says why', async () => {
+  it.each(['charge first', 'boost first'])('keeps Charge now and a battery boost together: %s', async (order) => {
     vi.useFakeTimers()
     vi.setSystemTime(CHARGING_EVENING)
-    await openedFor()
+    const { site } = await openedFor()
+    const sent = vi.spyOn(site, 'command')
 
-    button('Charge now')!.click()
+    if (order === 'charge first') {
+      button('Charge now')!.click()
+      await vi.advanceTimersByTimeAsync(1_000)
+    }
+    button('Boost from the house battery')!.click()
+    await vi.advanceTimersByTimeAsync(50)
+    button('Start boost')!.click()
     await vi.advanceTimersByTimeAsync(1_000)
+    expect(sent).toHaveBeenCalledWith(OP_LOADPOINT_BOOST, {
+      id: 'carport', min_battery_soc_pct: 30, duration_s: 3600,
+    })
+    if (order === 'boost first') {
+      button('Charge now')!.click()
+      await vi.advanceTimersByTimeAsync(1_000)
+    }
+    expect(document.body.textContent).toContain('Charge now is active')
+    expect(document.body.textContent).toContain('Battery boost is on')
+    expect(button('Return to plan')).toBeDefined()
+    expect(button('Stop boost')).toBeDefined()
 
-    expect(button('Boost from the house battery')).toBeUndefined()
-    expect(document.body.textContent).toContain('Available after returning to the plan')
+    button('Stop boost')!.click()
+    await vi.advanceTimersByTimeAsync(1_000)
+    expect(document.body.textContent).toContain('Charge now is active')
+    expect(document.body.textContent).not.toContain('Battery boost is on')
+    expect(button('Boost from the house battery')).toBeDefined()
   })
 
   it('explains where to connect a first charger instead of showing an empty panel', async () => {

From 26e3ad18c302de3c722b3d74bb3b3742d0f6dec3 Mon Sep 17 00:00:00 2001
From: Fredrik Ahlgren <fredrik@sourceful-labs.com>
Date: Sun, 27 Sep 2026 17:28:06 +0200
Subject: [PATCH 2/2] fix(ev): keep boost unavailable while charging is paused

---
 src/views/EvPanel.svelte         |  8 +++-----
 src/views/EvPanel.svelte.test.ts | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/views/EvPanel.svelte b/src/views/EvPanel.svelte
index 8068537..5cd8f62 100644
--- a/src/views/EvPanel.svelte
+++ b/src/views/EvPanel.svelte
@@ -745,12 +745,10 @@
         {#if site.canConfigure && lp.pluggedIn}
           <details class="extras">
             <summary>Home battery boost</summary>
-          <!-- The boost: a bounded lease the box caps at four hours. The
-               box refuses one while a hold runs or the charger is on spare
-               solar only, so the offer says so up front from what the box
-               served, instead of drawing a button that leads to a refusal. -->
           {#if !lp.boostActive}
-            {#if boostDraft?.lpId === lp.id}
+            {#if isPaused(lp)}
+              <p class="hint">Resume charging before starting a boost.</p>
+            {:else if boostDraft?.lpId === lp.id}
               <div class="editor">
                 <div class="row">
                   <span class="label">Battery boost</span>
diff --git a/src/views/EvPanel.svelte.test.ts b/src/views/EvPanel.svelte.test.ts
index 513da55..df601c9 100644
--- a/src/views/EvPanel.svelte.test.ts
+++ b/src/views/EvPanel.svelte.test.ts
@@ -905,6 +905,27 @@ describe('the charger behind its bubble', () => {
     expect(button('Boost from the house battery')).toBeDefined()
   })
 
+  it.each([false, true])('keeps boost unavailable while paused, including an open draft: %s', async (openDraft) => {
+    vi.useFakeTimers()
+    vi.setSystemTime(CHARGING_EVENING)
+    const { site } = await openedFor()
+    const sent = vi.spyOn(site, 'command')
+    if (openDraft) {
+      button('Boost from the house battery')!.click()
+      await vi.advanceTimersByTimeAsync(50)
+    }
+    button('Pause charging')!.click()
+    await vi.advanceTimersByTimeAsync(1_000)
+    expect(button('Boost from the house battery')).toBeUndefined()
+    expect(button('Start boost')).toBeUndefined()
+    expect(document.body.textContent).toContain('Resume charging before starting a boost.')
+    expect(sent.mock.calls.some(([op]) => op === OP_LOADPOINT_BOOST)).toBe(false)
+
+    button('Charge now')!.click()
+    await vi.advanceTimersByTimeAsync(1_000)
+    expect(button(openDraft ? 'Start boost' : 'Boost from the house battery')).toBeDefined()
+  })
+
   it.each(['charge first', 'boost first'])('keeps Charge now and a battery boost together: %s', async (order) => {
     vi.useFakeTimers()
     vi.setSystemTime(CHARGING_EVENING)