diff --git a/docs/handpaint-batch6-nanman-shaman-source-v2.png b/docs/handpaint-batch6-nanman-shaman-source-v2.png
new file mode 100644
index 0000000..c117ccb
Binary files /dev/null and b/docs/handpaint-batch6-nanman-shaman-source-v2.png differ
diff --git a/docs/handpaint-batch6-nanman-shaman-v2-animation.gif b/docs/handpaint-batch6-nanman-shaman-v2-animation.gif
new file mode 100644
index 0000000..88e87b4
Binary files /dev/null and b/docs/handpaint-batch6-nanman-shaman-v2-animation.gif differ
diff --git a/docs/handpaint-batch6-nanman-shaman-v2-battle-composite.png b/docs/handpaint-batch6-nanman-shaman-v2-battle-composite.png
new file mode 100644
index 0000000..88b17b9
Binary files /dev/null and b/docs/handpaint-batch6-nanman-shaman-v2-battle-composite.png differ
diff --git a/docs/handpaint-batch6-nanman-shaman-v2-before-after.png b/docs/handpaint-batch6-nanman-shaman-v2-before-after.png
new file mode 100644
index 0000000..0879e87
Binary files /dev/null and b/docs/handpaint-batch6-nanman-shaman-v2-before-after.png differ
diff --git a/docs/handpaint-batch6-nanman-shaman-v2-contact.png b/docs/handpaint-batch6-nanman-shaman-v2-contact.png
new file mode 100644
index 0000000..cf41f66
Binary files /dev/null and b/docs/handpaint-batch6-nanman-shaman-v2-contact.png differ
diff --git a/docs/handpaint-batch6-nanman-shaman-v2-debug-preview-battle-check.png b/docs/handpaint-batch6-nanman-shaman-v2-debug-preview-battle-check.png
new file mode 100644
index 0000000..dad60cf
Binary files /dev/null and b/docs/handpaint-batch6-nanman-shaman-v2-debug-preview-battle-check.png differ
diff --git a/docs/handpaint-batch6-nanman-shaman-v2-report.md b/docs/handpaint-batch6-nanman-shaman-v2-report.md
new file mode 100644
index 0000000..7d8ebd7
--- /dev/null
+++ b/docs/handpaint-batch6-nanman-shaman-v2-report.md
@@ -0,0 +1,24 @@
+# Nanman Shaman Hand-Painted v2
+
+- source: `handpaint-batch6-nanman-shaman-source-v2.png`
+- base status: ok
+- action status: ok
+- base partial alpha: 0, opaque pixels: 2186414
+- action partial alpha: 0, opaque pixels: 5631664
+- base frame border hits: 0
+- action frame border hits: 0
+- base empty frames: 0
+- action empty frames: 0
+- base bbox width range: 190..214
+- base bbox height range: 288..288
+- base bottom range: 303..303
+- action bbox width range: 197..263
+- action bbox height range: 277..290
+- action bottom range: 303..303
+- contact: `handpaint-batch6-nanman-shaman-v2-contact.png`
+- animation: `handpaint-batch6-nanman-shaman-v2-animation.gif`
+- before/after: `handpaint-batch6-nanman-shaman-v2-before-after.png`
+- scale compare: `handpaint-batch6-nanman-shaman-v2-scale-compare.png`
+- battle composite: `handpaint-batch6-nanman-shaman-v2-battle-composite.png`
+- manual checks: run build and local browser verification after generation
+- note: battle composite is a scale review image; gameplay roster is unchanged during sample approval
diff --git a/docs/handpaint-batch6-nanman-shaman-v2-scale-compare.png b/docs/handpaint-batch6-nanman-shaman-v2-scale-compare.png
new file mode 100644
index 0000000..1edcc56
Binary files /dev/null and b/docs/handpaint-batch6-nanman-shaman-v2-scale-compare.png differ
diff --git a/docs/unit-sprite-art-quality-gate.md b/docs/unit-sprite-art-quality-gate.md
index 8997c05..ac63a2b 100644
--- a/docs/unit-sprite-art-quality-gate.md
+++ b/docs/unit-sprite-art-quality-gate.md
@@ -6,9 +6,9 @@ This gate catches obvious sprite-art failures before user approval. It does not
 
 - Manifest: `docs/unit-sprite-rework-manifest.json`
 - Audit: `docs/unit-sprite-rework-audit.json`
-- Approved baseline units: 35
+- Approved baseline units: 36
 - Pending approval units: 0
-- Queued rework units: 56
+- Queued rework units: 55
 
 ## Checked Rules
 
diff --git a/docs/unit-sprite-current-approval-board.png b/docs/unit-sprite-current-approval-board.png
index eaf2e04..af1d117 100644
Binary files a/docs/unit-sprite-current-approval-board.png and b/docs/unit-sprite-current-approval-board.png differ
diff --git a/docs/unit-sprite-nanman-shaman-v2-approval-packet.md b/docs/unit-sprite-nanman-shaman-v2-approval-packet.md
new file mode 100644
index 0000000..72f9889
--- /dev/null
+++ b/docs/unit-sprite-nanman-shaman-v2-approval-packet.md
@@ -0,0 +1,36 @@
+# Unit Sprite Approval Packet: unit-nanman-shaman v2
+
+- Status: approved during continuous production run
+- Source art: `docs/handpaint-batch6-nanman-shaman-source-v2.png`
+- Contact sheet: `docs/handpaint-batch6-nanman-shaman-v2-contact.png`
+- Animation GIF: `docs/handpaint-batch6-nanman-shaman-v2-animation.gif`
+- Before/after: `docs/handpaint-batch6-nanman-shaman-v2-before-after.png`
+- Scale compare: `docs/handpaint-batch6-nanman-shaman-v2-scale-compare.png`
+- Browser check: `docs/handpaint-batch6-nanman-shaman-v2-debug-preview-battle-check.png`
+- Current approval board: `docs/unit-sprite-current-approval-board.png`
+- Debug preview URL: `http://127.0.0.1:4173/heros_web/?debug&debugSpritePreview=unit-nanman-shaman&v=nanman-shaman-v2-console-clean`
+
+## Visual Decision
+
+Nanman shaman v2 is accepted as a mystic/tactician unit. v1 was visually strong but failed the battle-scale width gate by a narrow margin; v2 keeps the robe, staff, feathered mask, and casting silhouette while slightly widening the body mass for clearer 50px readability.
+
+## Technical Checks
+
+- Base partial alpha: `0`
+- Action partial alpha: `0`
+- Base frame border hits: `0`
+- Action frame border hits: `0`
+- Base empty frames: `0`
+- Action empty frames: `0`
+- Base bbox width range: `190..214`
+- Base bbox height range: `288..288`
+- Base bottom range: `303..303`
+- Action bbox width range: `197..263`
+- Action bbox height range: `277..290`
+- Action bottom range: `303..303`
+- Local build: `passed`
+- Local browser console errors: `0`
+
+## Notes
+
+The unit stays fully opaque and stable across idle, walk, and casting frames. It reads as a tactic-class enemy without external rings, bases, or badges.
diff --git a/docs/unit-sprite-next-steps.md b/docs/unit-sprite-next-steps.md
index bad224b..86a57a6 100644
--- a/docs/unit-sprite-next-steps.md
+++ b/docs/unit-sprite-next-steps.md
@@ -4,9 +4,9 @@ This file is generated by `scripts/write-unit-sprite-next-steps.py`.
 
 ## Current Gate
 
-- Approved baseline units: 35
+- Approved baseline units: 36
 - Pending approval units: 0
-- Queued rework units: 56
+- Queued rework units: 55
 - Manifest: `docs/unit-sprite-rework-manifest.json`
 - Audit: `docs/unit-sprite-rework-audit.json`
 - Current approval board: not generated until the next pending sample.
@@ -14,9 +14,8 @@ This file is generated by `scripts/write-unit-sprite-next-steps.py`.
 
 ## Next Unit Queue
 
-1. `unit-nanman-shaman` - queued-rework, base `border-hits=32`, actions `border-hits=98`
-2. `unit-nanman-shaman-ember` - queued-rework, base `border-hits=32`, actions `border-hits=98`
-3. `unit-nanman-shaman-storm` - queued-rework, base `border-hits=32`, actions `border-hits=98`
+1. `unit-nanman-shaman-ember` - queued-rework, base `border-hits=32`, actions `border-hits=98`
+2. `unit-nanman-shaman-storm` - queued-rework, base `border-hits=32`, actions `border-hits=98`
 
 ## Commands Before Approval
 
@@ -43,5 +42,5 @@ pnpm build
 
 ## First Task After Current Approval
 
-- Start with `unit-nanman-shaman`.
+- Start with `unit-nanman-shaman-ember`.
 - Generate source art, assemble sheets, produce contact/GIF/before-after/scale/battle screenshots, then rerun the gates.
diff --git a/docs/unit-sprite-review-approved-and-pending.png b/docs/unit-sprite-review-approved-and-pending.png
index 4f1fb7f..e8112ab 100644
Binary files a/docs/unit-sprite-review-approved-and-pending.png and b/docs/unit-sprite-review-approved-and-pending.png differ
diff --git a/docs/unit-sprite-review-batch6-nanman-special.png b/docs/unit-sprite-review-batch6-nanman-special.png
index b80f2c8..da90579 100644
Binary files a/docs/unit-sprite-review-batch6-nanman-special.png and b/docs/unit-sprite-review-batch6-nanman-special.png differ
diff --git a/docs/unit-sprite-review-index.png b/docs/unit-sprite-review-index.png
index 482ba85..3e32b0e 100644
Binary files a/docs/unit-sprite-review-index.png and b/docs/unit-sprite-review-index.png differ
diff --git a/docs/unit-sprite-rework-audit.json b/docs/unit-sprite-rework-audit.json
index e7379d5..503d92e 100644
--- a/docs/unit-sprite-rework-audit.json
+++ b/docs/unit-sprite-rework-audit.json
@@ -11,8 +11,8 @@
     "batch7-unique-officer": 19
   },
   "stage_counts": {
-    "approved-baseline": 35,
-    "queued-rework": 56
+    "approved-baseline": 36,
+    "queued-rework": 55
   },
   "rows": [
     {
@@ -1214,7 +1214,7 @@
     },
     {
       "batch": "batch6-nanman-special",
-      "review_stage": "queued-rework",
+      "review_stage": "approved-baseline",
       "stem": "unit-nanman-shaman",
       "base": {
         "key": "unit-nanman-shaman",
@@ -1224,23 +1224,23 @@
           1252
         ],
         "partial_alpha": 0,
-        "opaque_pixels": 1999925,
-        "border_hits": 32,
-        "min_width": 243,
-        "max_width": 246,
-        "min_height": 280,
-        "max_height": 281,
-        "min_bottom": 281,
-        "max_bottom": 287,
+        "opaque_pixels": 2186414,
+        "border_hits": 0,
+        "min_width": 190,
+        "max_width": 214,
+        "min_height": 288,
+        "max_height": 288,
+        "min_bottom": 303,
+        "max_bottom": 303,
         "empty_frames": 0,
-        "width_swing": 3,
-        "height_swing": 1,
-        "bottom_swing": 6,
-        "battle_min_width_px": 38.8,
-        "battle_max_width_px": 39.3,
-        "battle_min_height_px": 44.7,
-        "battle_max_height_px": 44.9,
-        "status": "border-hits=32"
+        "width_swing": 24,
+        "height_swing": 0,
+        "bottom_swing": 0,
+        "battle_min_width_px": 30.4,
+        "battle_max_width_px": 34.2,
+        "battle_min_height_px": 46.0,
+        "battle_max_height_px": 46.0,
+        "status": "ok"
       },
       "actions": {
         "key": "unit-nanman-shaman-actions",
@@ -1250,23 +1250,23 @@
           1252
         ],
         "partial_alpha": 0,
-        "opaque_pixels": 4453376,
-        "border_hits": 98,
-        "min_width": 220,
-        "max_width": 255,
-        "min_height": 275,
-        "max_height": 281,
-        "min_bottom": 274,
-        "max_bottom": 289,
+        "opaque_pixels": 5631664,
+        "border_hits": 0,
+        "min_width": 197,
+        "max_width": 263,
+        "min_height": 277,
+        "max_height": 290,
+        "min_bottom": 303,
+        "max_bottom": 303,
         "empty_frames": 0,
-        "width_swing": 35,
-        "height_swing": 6,
-        "bottom_swing": 15,
-        "battle_min_width_px": 35.1,
-        "battle_max_width_px": 40.7,
-        "battle_min_height_px": 43.9,
-        "battle_max_height_px": 44.9,
-        "status": "border-hits=98"
+        "width_swing": 66,
+        "height_swing": 13,
+        "bottom_swing": 0,
+        "battle_min_width_px": 31.5,
+        "battle_max_width_px": 42.0,
+        "battle_min_height_px": 44.2,
+        "battle_max_height_px": 46.3,
+        "status": "ok"
       }
     },
     {
diff --git a/docs/unit-sprite-rework-audit.md b/docs/unit-sprite-rework-audit.md
index a8da4b6..3e3e56e 100644
--- a/docs/unit-sprite-rework-audit.md
+++ b/docs/unit-sprite-rework-audit.md
@@ -29,8 +29,8 @@ Visual review boards are generated by `scripts/render-unit-sprite-review-boards.
 
 ## Review Stage Counts
 
-- approved-baseline: 35
-- queued-rework: 56
+- approved-baseline: 36
+- queued-rework: 55
 
 ## Batch Plan
 
@@ -73,7 +73,7 @@ Visual review boards are generated by `scripts/render-unit-sprite-review-boards.
 | batch6-nanman-special | approved-baseline | `unit-nanman-officer` | ok | ok | 163..215 x 288..288 | 159..238 x 280..288 | 26.0..34.3 x 46.0..46.0 | w52 h0 b0 |
 | batch6-nanman-special | approved-baseline | `unit-nanman-officer-bronze` | ok | ok | 177..214 x 284..288 | 155..264 x 238..295 | 28.3..34.2 x 45.4..46.0 | w37 h4 b0 |
 | batch6-nanman-special | approved-baseline | `unit-nanman-officer-warlord` | ok | ok | 204..234 x 284..288 | 173..259 x 256..295 | 32.6..37.4 x 45.4..46.0 | w30 h4 b0 |
-| batch6-nanman-special | queued-rework | `unit-nanman-shaman` | border-hits=32 | border-hits=98 | 243..246 x 280..281 | 220..255 x 275..281 | 38.8..39.3 x 44.7..44.9 | w3 h1 b6 |
+| batch6-nanman-special | approved-baseline | `unit-nanman-shaman` | ok | ok | 190..214 x 288..288 | 197..263 x 277..290 | 30.4..34.2 x 46.0..46.0 | w24 h0 b0 |
 | batch6-nanman-special | queued-rework | `unit-nanman-shaman-ember` | border-hits=32 | border-hits=98 | 243..246 x 280..281 | 220..255 x 275..281 | 38.8..39.3 x 44.7..44.9 | w3 h1 b6 |
 | batch6-nanman-special | queued-rework | `unit-nanman-shaman-storm` | border-hits=32 | border-hits=98 | 243..246 x 280..281 | 220..255 x 275..281 | 38.8..39.3 x 44.7..44.9 | w3 h1 b6 |
 | batch7-unique-officer | queued-rework | `unit-pang-tong` | border-hits=32 | border-hits=98 | 243..246 x 280..281 | 220..255 x 275..281 | 38.8..39.3 x 44.7..44.9 | w3 h1 b6 |
diff --git a/docs/unit-sprite-rework-manifest.json b/docs/unit-sprite-rework-manifest.json
index b823b79..1b6bbf8 100644
--- a/docs/unit-sprite-rework-manifest.json
+++ b/docs/unit-sprite-rework-manifest.json
@@ -20,6 +20,7 @@
     "unit-nanman-officer",
     "unit-nanman-officer-bronze",
     "unit-nanman-officer-warlord",
+    "unit-nanman-shaman",
     "unit-rebel",
     "unit-rebel-archer",
     "unit-rebel-archer-fire",
@@ -50,7 +51,6 @@
   "pendingApproval": [],
   "currentApprovalCandidate": {},
   "nextAfterApproval": [
-    "unit-nanman-shaman",
     "unit-nanman-shaman-ember",
     "unit-nanman-shaman-storm"
   ],
diff --git a/src/assets/images/units/unit-nanman-shaman-actions.png b/src/assets/images/units/unit-nanman-shaman-actions.png
index c04d232..e634f72 100644
Binary files a/src/assets/images/units/unit-nanman-shaman-actions.png and b/src/assets/images/units/unit-nanman-shaman-actions.png differ
diff --git a/src/assets/images/units/unit-nanman-shaman.png b/src/assets/images/units/unit-nanman-shaman.png
index 23a4e63..52eaa25 100644
Binary files a/src/assets/images/units/unit-nanman-shaman.png and b/src/assets/images/units/unit-nanman-shaman.png differ