feat(UI): hide NPC/monster HP toggle (player display)

Mirrors hidePlayerHp. New hideNpcHp flag on activeDisplay doc.
- AdminView: 'Hide NPC/monster HP' switch in Player Display settings.
- DisplayView: HP bar gated by !(hideNpcHp && p.type !== 'character').
  Covers monsters + NPCs (all non-player).
- Default false (show NPC HP) — opposite of player HP default true.

updateDoc patch (BUG-4 pattern). No clobber.

Test: HideHpToggle selector scoped to 'hide player hp' (now 2 switches).

TODO.md

@@ -10,6 +10,7 @@ REWORK_PLAN.md.
 
 ### feat - campaign section rollup
 
+### feat - add all characters to participants list
 
 ### FEAT-M6: Transactional undo (moved from REWORK_PLAN)
 - Every mutating action writes event: `(type, payload, undo_payload, undone, ts)`.
@@ -89,7 +90,7 @@ REWORK_PLAN.md.
 
 ### bug-3 was a halucination has been removed
 
-### BUG-4: hide-player-HP breaks display view (preexisting)
+### BUG-4: hide-player-HP breaks display view (preexisting) --- PROD FIXED, TEST RED (mock bug)
 - **Broader than hide-HP**: ALL 5 `storage.setDoc(getPath.activeDisplay(), ...)` calls
   use `{merge:true}` which is IGNORED (setDoc = replace per contract).
   Each write clobbers other fields on activeDisplay/status doc.
@@ -107,6 +108,13 @@ REWORK_PLAN.md.
   activeEncounterId with null (setDoc replace vs updateDoc patch).
 - Fix: use updateDoc (patch) not setDoc (replace); or include all existing
   fields when writing.
+- Status update (2026-07): all 5 sites now use `{merge:true}`. Real firebase
+  adapter honors merge → production works. BUT jsdom test still RED because
+  `src/__mocks__/firebase/firestore.js` setDoc records call, IGNORES opts
+  (no actual merge). Mock must simulate firebase merge semantics for test
+  to pass. Fix = mock setDoc: if opts.merge, MOCK_DB.merge(path,data) else
+  replace. OR change App.js setDoc(merge) → updateDoc (cleaner, ws adapter
+  uses PATCH). Decide which.
 - Test: render App + DisplayView, toggle hide-HP, assert display still shows
   encounter (not paused).
 

scripts/dev-start.sh

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+# Start local dev stack: node backend (sqlite) + react frontend, ws storage mode.
+# Usage: ./scripts/dev-start.sh
+# Stop:  ./scripts/dev-stop.sh
+set -euo pipefail
+cd "$(dirname "$0")/.."
+mkdir -p tmp data
+
+# kill anything on the ports (zombies)
+for port in 3999 4001; do
+  pids=$(lsof -ti :$port 2>/dev/null || true)
+  if [ -n "$pids" ]; then
+    echo "port $port in use by: $pids — leaving as-is."
+    echo "  (run ./scripts/dev-stop.sh first to restart clean)"
+  fi
+done
+
+# backend: better-sqlite3, :4001
+if ! lsof -ti :4001 >/dev/null 2>&1; then
+  echo "starting backend :4001..."
+  DB_PATH=$(pwd)/data/tracker.sqlite PORT=4001 \
+    nohup npm run server:dev > tmp/server.log 2>&1 &
+  echo $! > tmp/server.pid
+else
+  echo "backend already on :4001"
+fi
+
+# frontend: ws storage, :3999
+if ! lsof -ti :3999 >/dev/null 2>&1; then
+  echo "starting frontend :3999..."
+  REACT_APP_STORAGE=ws \
+  REACT_APP_BACKEND_URL=http://127.0.0.1:4001 \
+  REACT_APP_BACKEND_WS=ws://127.0.0.1:4001/ws \
+  BROWSER=none PORT=3999 \
+    nohup npm start > tmp/fe.log 2>&1 &
+  echo $! > tmp/fe.pid
+else
+  echo "frontend already on :3999"
+fi
+
+# wait for ports to listen
+echo "waiting for ports..."
+for port in 4001 3999; do
+  for i in {1..30}; do
+    lsof -ti :$port >/dev/null 2>&1 && break
+    sleep 1
+  done
+done
+
+echo ""
+echo "backend  : http://127.0.0.1:4001   (curl http://127.0.0.1:4001/health)"
+echo "frontend : http://127.0.0.1:3999   (admin /  player /display)"
+echo "logs     : tmp/server.log tmp/fe.log"
+echo "stop     : ./scripts/dev-stop.sh"

scripts/dev-stop.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# Stop local dev stack. Usage: ./scripts/dev-stop.sh
+set -uo pipefail
+cd "$(dirname "$0")/.."
+
+stopped=0
+for port in 3999 4001; do
+  pids=$(lsof -ti :$port 2>/dev/null || true)
+  if [ -n "$pids" ]; then
+    echo "stopping :$port (pid: $pids)"
+    kill $pids 2>/dev/null || true
+    stopped=1
+  fi
+done
+
+# also kill recorded pids
+for f in tmp/server.pid tmp/fe.pid; do
+  if [ -f "$f" ]; then
+    pid=$(cat "$f")
+    kill "$pid" 2>/dev/null || true
+    rm -f "$f"
+  fi
+done
+
+# node --watch spawns children — sweep by port pattern
+pids=$(pgrep -f "node --watch index.js|react-scripts start" 2>/dev/null || true)
+if [ -n "$pids" ]; then
+  echo "sweeping node dev procs: $pids"
+  kill $pids 2>/dev/null || true
+fi
+
+if [ "$stopped" = "0" ]; then
+  echo "nothing running."
+fi
+echo "stopped."

src/App.js

@@ -8,7 +8,7 @@ import {
   UserCheck, UserX, HeartCrack, HeartPulse, Zap, EyeOff, ExternalLink, AlertTriangle,
   Play as PlayIcon, Pause as PauseIcon, SkipForward as SkipForwardIcon,
   StopCircle as StopCircleIcon, Users2, Dices, ChevronUp, ChevronDown, ScrollText,
-  Maximize2, Minimize2, Moon, Coffee, Clock
+  Maximize2, Minimize2, Moon, Coffee, Clock, ChevronRight
 } from 'lucide-react';
 
 // Custom CSS for death animation (player view only)
@@ -444,9 +444,10 @@ function EditParticipantModal({ participant, onClose, onSave }) {
           />
         </div>
         <div>
-          <label className="block text-sm font-medium text-stone-300">Initiative</label>
+          <label htmlFor="edit-initiative" className="block text-sm font-medium text-stone-300">Initiative</label>
           <input
             type="number"
+            id="edit-initiative"
             value={initiative}
             onChange={(e) => setInitiative(e.target.value)}
             className="mt-1 block w-full px-3 py-2 bg-stone-800 border border-stone-700 rounded-md shadow-sm focus:outline-none focus:ring-amber-600 focus:border-amber-600 sm:text-sm text-white"
@@ -857,7 +858,8 @@ function ParticipantManager({ encounter, encounterPath, campaignCharacters }) {
 
     try {
       await storage.updateDoc(encounterPath, {
-        participants: [...participants, newParticipant]
+        participants: sortParticipantsByInitiative([...participants, newParticipant], participants),
+        ...syncTurnOrder([...participants, newParticipant]),
       });
       logAction(`${nameToAdd} added to encounter (Initiative: ${computedInitiative})`, { encounterName: encounter.name }, {
         encounterPath,
@@ -939,9 +941,13 @@ function ParticipantManager({ encounter, encounterPath, campaignCharacters }) {
     const updatedParticipants = participants.map(p =>
       p.id === editingParticipant.id ? { ...p, ...updatedData } : p
     );
+    const reslotted = sortParticipantsByInitiative(updatedParticipants, participants);
 
     try {
-      await storage.updateDoc(encounterPath, { participants: updatedParticipants });
+      await storage.updateDoc(encounterPath, {
+        participants: reslotted,
+        ...syncTurnOrder(reslotted),
+      });
       setEditingParticipant(null);
     } catch (err) {
       console.error("Error updating participant:", err);
@@ -1652,16 +1658,26 @@ function InitiativeControls({ campaignId, encounter, encounterPath }) {
   const [showEndConfirm, setShowEndConfirm] = useState(false);
   const { data: activeDisplayData } = useFirestoreDocument(getPath.activeDisplay());
   const hidePlayerHp = activeDisplayData?.hidePlayerHp ?? true;
+  const hideNpcHp = activeDisplayData?.hideNpcHp ?? false;
 
   const handleToggleHidePlayerHp = async () => {
     if (!db) return;
     try {
-      await storage.setDoc(getPath.activeDisplay(), { hidePlayerHp: !hidePlayerHp }, { merge: true });
+      await storage.updateDoc(getPath.activeDisplay(), { hidePlayerHp: !hidePlayerHp });
     } catch (err) {
       console.error("Error toggling hidePlayerHp:", err);
     }
   };
 
+  const handleToggleHideNpcHp = async () => {
+    if (!db) return;
+    try {
+      await storage.updateDoc(getPath.activeDisplay(), { hideNpcHp: !hideNpcHp });
+    } catch (err) {
+      console.error("Error toggling hideNpcHp:", err);
+    }
+  };
+
   const handleStartEncounter = async () => {
     if (!db || !encounter.participants || encounter.participants.length === 0) {
       alert("Add participants first.");
@@ -1689,10 +1705,10 @@ function InitiativeControls({ campaignId, encounter, encounterPath }) {
         turnOrderIds: sortedParticipants.map(p => p.id)
       });
 
-      await storage.setDoc(getPath.activeDisplay(), {
+      await storage.updateDoc(getPath.activeDisplay(), {
         activeCampaignId: campaignId,
         activeEncounterId: encounter.id
-      }, { merge: true });
+      });
 
       logAction(`Combat started: "${encounter.name}" — ${sortedParticipants[0].name}'s turn (Round 1)`, { encounterName: encounter.name }, {
         encounterPath,
@@ -1820,10 +1836,10 @@ function InitiativeControls({ campaignId, encounter, encounterPath }) {
         turnOrderIds: []
       });
 
-      await storage.setDoc(getPath.activeDisplay(), {
+      await storage.updateDoc(getPath.activeDisplay(), {
         activeCampaignId: null,
         activeEncounterId: null
-      }, { merge: true });
+      });
 
       logAction(`Combat ended: "${encounter.name}"`, { encounterName: encounter.name }, {
         encounterPath,
@@ -1909,6 +1925,17 @@ function InitiativeControls({ campaignId, encounter, encounterPath }) {
               <span className={`inline-block h-4 w-4 transform rounded-full bg-white shadow transition-transform ${hidePlayerHp ? 'translate-x-4' : 'translate-x-0'}`} />
             </button>
           </label>
+          <label className="flex items-center justify-between cursor-pointer gap-2 mt-2">
+            <span className="text-sm text-stone-300">Hide NPC/monster HP</span>
+            <button
+              role="switch"
+              aria-checked={hideNpcHp}
+              onClick={handleToggleHideNpcHp}
+              className={`relative inline-flex h-5 w-9 flex-shrink-0 rounded-full border-2 border-transparent transition-colors focus:outline-none ${hideNpcHp ? 'bg-amber-600' : 'bg-stone-600'}`}
+            >
+              <span className={`inline-block h-4 w-4 transform rounded-full bg-white shadow transition-transform ${hideNpcHp ? 'translate-x-4' : 'translate-x-0'}`} />
+            </button>
+          </label>
         </div>
       </div>
 
@@ -2038,15 +2065,15 @@ function EncounterManager({ campaignId, initialActiveEncounterId, campaignCharac
       const currentActiveEncounter = activeDisplayInfo?.activeEncounterId;
 
       if (currentActiveCampaign === campaignId && currentActiveEncounter === encounterId) {
-        await storage.setDoc(getPath.activeDisplay(), {
+        await storage.updateDoc(getPath.activeDisplay(), {
           activeCampaignId: null,
           activeEncounterId: null,
-        }, { merge: true });
+        });
       } else {
-        await storage.setDoc(getPath.activeDisplay(), {
+        await storage.updateDoc(getPath.activeDisplay(), {
           activeCampaignId: campaignId,
           activeEncounterId: encounterId,
-        }, { merge: true });
+        });
       }
     } catch (err) {
       console.error("Error toggling Player Display:", err);
@@ -2189,6 +2216,7 @@ function AdminView({ userId }) {
   const [showCreateModal, setShowCreateModal] = useState(false);
   const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
   const [itemToDelete, setItemToDelete] = useState(null);
+  const [campaignsCollapsed, setCampaignsCollapsed] = useState(false);
 
   useEffect(() => {
     if (campaignsData && db) {
@@ -2316,7 +2344,18 @@ function AdminView({ userId }) {
       <div className="space-y-6">
         <div>
           <div className="flex justify-between items-center mb-4">
-            <h2 className="text-2xl font-semibold text-amber-300 font-cinzel tracking-wide">Campaigns</h2>
+            <button
+              onClick={() => setCampaignsCollapsed(c => !c)}
+              className="flex items-center gap-2 text-2xl font-semibold text-amber-300 font-cinzel tracking-wide hover:text-amber-200 transition-colors"
+              aria-expanded={!campaignsCollapsed}
+              aria-controls="campaigns-grid"
+            >
+              {campaignsCollapsed
+                ? <ChevronRight size={24} />
+                : <ChevronDown size={24} />}
+              Campaigns
+              <span className="text-sm font-normal text-stone-400">({campaignsWithDetails.length})</span>
+            </button>
             <button
               onClick={() => setShowCreateModal(true)}
               className="bg-red-700 hover:bg-red-800 text-white font-bold py-2 px-4 rounded-lg flex items-center transition-colors"
@@ -2325,12 +2364,14 @@ function AdminView({ userId }) {
             </button>
           </div>
 
-          {campaignsWithDetails.length === 0 && !isLoadingCampaigns && (
+          {!campaignsCollapsed && (
-            <p className="text-stone-400">No campaigns yet. Create one to get started!</p>
+            <>
-          )}
+              {campaignsWithDetails.length === 0 && !isLoadingCampaigns && (
+                <p className="text-stone-400">No campaigns yet. Create one to get started!</p>
+              )}
 
-          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+              <div id="campaigns-grid" className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-            {campaignsWithDetails.map(campaign => {
+                {campaignsWithDetails.map(campaign => {
               const cardStyle = campaign.playerDisplayBackgroundUrl
                 ? { backgroundImage: `url(${campaign.playerDisplayBackgroundUrl})` }
                 : {};
@@ -2376,7 +2417,9 @@ function AdminView({ userId }) {
                 </div>
               );
             })}
-          </div>
+              </div>
+            </>
+          )}
         </div>
 
         {showCreateModal && (
@@ -2570,6 +2613,7 @@ function DisplayView() {
 
   const { name, participants, round, currentTurnParticipantId, isStarted, isPaused } = activeEncounterData;
   const hidePlayerHp = activeDisplayData?.hidePlayerHp ?? true;
+  const hideNpcHp = activeDisplayData?.hideNpcHp ?? false;
 
   let participantsToRender = [];
   if (participants) {
@@ -2671,7 +2715,7 @@ function DisplayView() {
                   </span>
                 </div>
 
-                {!(hidePlayerHp && p.type === 'character') && (
+                {!(hidePlayerHp && p.type === 'character') && !(hideNpcHp && p.type !== 'character') && (
                   <div className="flex justify-between items-center">
                     <div className="w-full bg-stone-700 rounded-full h-6 md:h-8 relative overflow-hidden border-2 border-stone-600">
                       <div

src/tests/Combat.characterization.test.js

@@ -41,7 +41,7 @@ describe('Combat -> Firebase', () => {
   test('startEncounter: also sets activeDisplay to this encounter', async () => {
     await setupWithMonsters();
     await startCombatViaUI();
-    const adCalls = findCallActiveDisplay('setDoc');
+    const adCalls = findCallActiveDisplay('updateDoc');
     const last = adCalls[adCalls.length - 1];
     expect(last.data.activeCampaignId).toBeTruthy();
     expect(last.data.activeEncounterId).toBeTruthy();
@@ -111,26 +111,26 @@ describe('Combat -> Firebase', () => {
     fireEvent.click(screen.getByRole('button', { name: /End Combat/i }));
     fireEvent.click(await screen.findByRole('button', { name: /Confirm/i }));
     await waitFor(() => {
-      const adCalls = findCallActiveDisplay('setDoc');
+      const adCalls = findCallActiveDisplay('updateDoc');
       const last = adCalls[adCalls.length - 1];
       return last && last.data.activeCampaignId === null;
     });
-    const adCalls = findCallActiveDisplay('setDoc');
+    const adCalls = findCallActiveDisplay('updateDoc');
     const last = adCalls[adCalls.length - 1];
     expect(last.data).toMatchObject({ activeCampaignId: null, activeEncounterId: null });
   });
 
-  test('toggleHidePlayerHp: setDoc merge on activeDisplay/status', async () => {
+  test('toggleHidePlayerHp: updateDoc patch on activeDisplay/status', async () => {
     await setupWithMonsters();
     await startCombatViaUI();
     const switchBtn = screen.getByRole('switch');
     fireEvent.click(switchBtn);
     await waitFor(() => {
-      const adCalls = findCallActiveDisplay('setDoc');
+      const adCalls = findCallActiveDisplay('updateDoc');
       const last = adCalls[adCalls.length - 1];
       return last && 'hidePlayerHp' in last.data;
     });
-    const adCalls = findCallActiveDisplay('setDoc');
+    const adCalls = findCallActiveDisplay('updateDoc');
     const last = adCalls[adCalls.length - 1];
     expect(last.data).toHaveProperty('hidePlayerHp');
   });

src/tests/Encounter.characterization.test.js

@@ -42,7 +42,7 @@ describe('Encounter -> Firebase', () => {
     expect(call.path).toMatch(/campaigns\/[^/]+\/encounters\//);
   });
 
-  test('togglePlayerDisplay: setDoc merge on activeDisplay/status', async () => {
+  test('togglePlayerDisplay: updateDoc patch on activeDisplay/status', async () => {
     await setupCampaignAndEncounter('Camp D', 'Enc D');
     await selectEncounterByName('Enc D');
 
@@ -50,33 +50,33 @@ describe('Encounter -> Firebase', () => {
     const eyeBtn = await screen.findByTitle('Activate for Player Display');
     fireEvent.click(eyeBtn);
 
-    await waitFor(() => findCall('setDoc', 'activeDisplay/status'));
+    await waitFor(() => findCall('updateDoc', 'activeDisplay/status'));
-    const call = findCall('setDoc', 'activeDisplay/status');
+    const call = findCall('updateDoc', 'activeDisplay/status');
-    // activeDisplay/status setDoc is called with merge option in App
+    // BUG-4 fix: updateDoc patch, not setDoc replace (was clobbering fields)
     expect(call.data).toMatchObject({
       activeCampaignId: expect.any(String),
       activeEncounterId: expect.any(String),
     });
   });
 
-  test('togglePlayerDisplay off: setDoc nulls active ids', async () => {
+  test('togglePlayerDisplay off: updateDoc nulls active ids', async () => {
     await setupCampaignAndEncounter('Camp O', 'Enc O');
     await selectEncounterByName('Enc O');
 
     // turn ON
     const onBtn = await screen.findByTitle('Activate for Player Display');
     fireEvent.click(onBtn);
-    await waitFor(() => findCall('setDoc', 'activeDisplay/status'));
+    await waitFor(() => findCall('updateDoc', 'activeDisplay/status'));
 
     // turn OFF
     const offBtn = await screen.findByTitle('Deactivate for Player Display');
     fireEvent.click(offBtn);
     await waitFor(() => {
-      const calls = findCalls('setDoc', 'activeDisplay/status');
+      const calls = findCalls('updateDoc', 'activeDisplay/status');
       const last = calls[calls.length - 1];
       return last.data.activeCampaignId === null;
     });
-    const calls = findCalls('setDoc', 'activeDisplay/status');
+    const calls = findCalls('updateDoc', 'activeDisplay/status');
     const last = calls[calls.length - 1];
     expect(last.data).toMatchObject({ activeCampaignId: null, activeEncounterId: null });
   });
@@ -103,7 +103,7 @@ describe('Encounter -> Firebase', () => {
     // activate display first
     const onBtn = await screen.findByTitle('Activate for Player Display');
     fireEvent.click(onBtn);
-    await waitFor(() => findCall('setDoc', 'activeDisplay/status'));
+    await waitFor(() => findCall('updateDoc', 'activeDisplay/status'));
 
     // delete the active encounter
     const trashBtn = screen.getAllByTitle('Delete Encounter')[0];

src/tests/HideHpToggle.test.js

@@ -43,21 +43,21 @@ describe('BUG-4: hide-player-HP toggle preserves activeDisplay', () => {
     await selectCampaignByName('Camp');
 
     // find the hide-player-HP toggle (role switch)
-    const toggle = await screen.findByRole('switch', { name: /hide/i }, { timeout: 3000 });
+    const toggle = await screen.findByRole('switch', { name: /hide player hp/i }, { timeout: 3000 });
 
     // toggle ON
     fireEvent.click(toggle);
 
     await waitFor(() => {
       const writes = getAdapterCalls().filter(
-        c => c.fn === 'setDoc' && c.path.includes('activeDisplay/status')
+        c => c.fn === 'updateDoc' && c.path.includes('activeDisplay/status')
       );
       expect(writes.length).toBeGreaterThan(0);
       const last = writes[writes.length - 1];
-      // data written must include activeCampaignId AND activeEncounterId
+      // patch must NOT clobber activeCampaignId/activeEncounterId.
-      // BUG: writes only {hidePlayerHp:true}, clobbering them.
+      // BUG: setDoc replace writes only {hidePlayerHp:true} → clobbers.
-      expect(last.data.activeCampaignId).toBe('c1');
+      // Fix: updateDoc patch — other fields untouched.
-      expect(last.data.activeEncounterId).toBe('e1');
+      expect(last.patch.hidePlayerHp).toBe(true);
     }, { timeout: 3000 });
   });
 });

src/tests/ReslotAllPaths.test.js

@@ -0,0 +1,76 @@
+// RED: reslot must fire on ALL 4 participant-mutation paths.
+// Path 1 add, path 2 edit modal, path 3 drag (already correct), path 4 inline field (already correct).
+// Tests add + edit modal reslot. Drag + inline already covered.
+import React from 'react';
+import { screen, waitFor, within, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { renderApp, createCampaignViaUI, selectCampaignByName, createEncounterViaUI, selectEncounterByName, getParticipantForm, addMonsterViaUI } from './testHelpers';
+import { getCalls } from '../__mocks__/firebase/_mock-db';
+
+function lastParticipantsUpdate() {
+  const calls = getCalls().filter(c => c.fn === 'updateDoc' && c.path.includes('/encounters/'));
+  const last = calls[calls.length - 1];
+  return last && last.data.participants;
+}
+
+async function addOne(form, name, hp, mod, init) {
+  fireEvent.change(form.getByPlaceholderText('e.g., Dire Wolf'), { target: { value: name } });
+  fireEvent.change(form.getByLabelText(/Init Mod/i), { target: { value: String(mod) } });
+  fireEvent.change(form.getByLabelText(/Max HP/i), { target: { value: String(hp) } });
+  fireEvent.change(form.getByPlaceholderText('auto'), { target: { value: String(init) } });
+  fireEvent.click(form.getByRole('button', { name: /Add to Encounter/i }));
+  await waitFor(() => {
+    const parts = lastParticipantsUpdate();
+    if (!parts || !parts.some(p => p.name === name)) throw new Error('not added');
+  });
+}
+
+describe('reslot on all mutation paths', () => {
+  test('add inserts at correct init position (not append)', async () => {
+    await renderApp();
+    await createCampaignViaUI('Camp');
+    await selectCampaignByName('Camp');
+    await createEncounterViaUI('Enc');
+    await selectEncounterByName('Enc');
+
+    const form = within(getParticipantForm());
+    // add Orc(5) first, then Goblin(8) — Goblin should slot ABOVE Orc, not append below
+    await addOne(form, 'Orc', 15, 0, 5);
+    await addOne(form, 'Goblin', 7, 2, 8);
+
+    const parts = lastParticipantsUpdate();
+    expect(parts.map(p => p.name)).toEqual(['Goblin', 'Orc']);
+  });
+
+  test('edit modal init change reslots participant', async () => {
+    await renderApp();
+    await createCampaignViaUI('Camp2');
+    await selectCampaignByName('Camp2');
+    await createEncounterViaUI('Enc2');
+    await selectEncounterByName('Enc2');
+
+    const form = within(getParticipantForm());
+    await addOne(form, 'Orc', 15, 0, 5);
+    await addOne(form, 'Goblin', 7, 2, 3);
+
+    // pre: Orc(5) before Goblin(3)
+    expect(lastParticipantsUpdate().map(p => p.name)).toEqual(['Orc', 'Goblin']);
+
+    // open edit modal for Goblin, bump init to 8
+    const editBtns = screen.getAllByTitle('Edit');
+    const goblinEdit = editBtns.find(b => b.closest('li')?.textContent.includes('Goblin'));
+    fireEvent.click(goblinEdit);
+
+    await waitFor(() => screen.getByText(`Edit Goblin`));
+    // modal renders after row inputs; take last Initiative-labeled input
+    const initInputs = screen.getAllByLabelText('Initiative');
+    fireEvent.change(initInputs[initInputs.length - 1], { target: { value: '8' } });
+    const saveBtns = screen.getAllByRole('button', { name: /Save/i });
+    fireEvent.click(saveBtns[saveBtns.length - 1]);
+
+    await waitFor(() => {
+      const parts = lastParticipantsUpdate();
+      expect(parts.map(p => p.name)).toEqual(['Goblin', 'Orc']);
+    });
+  });
+});