fix: swap combat roles - Mahoraga as AUTO boss, player as user-controlled, clear combat log labels

api.py

@@ -220,7 +220,7 @@ class CombatState(BaseModel):
 
 
 class StepRequest(BaseModel):
-    action: int  # 0-4
+    player_action: Optional[str] = None  # None means auto (based on difficulty)
 
 
 class ResetRequest(BaseModel):
@@ -278,14 +278,23 @@ def reset(req: ResetRequest = ResetRequest()):
     )
 
 
-def _do_step(action, llm_raw=None):
-    """Execute one turn of combat (shared by manual step and auto-step)."""
+def _do_step(player_action=None):
+    """Execute one turn of combat. Mahoraga uses LLM to pick action, player uses player_action."""
     global env
     if env is None:
         env = MahoragaEnv(difficulty=current_difficulty)
         env.reset()
 
-    state, reward, done, info = env.step(action)
+    # Load model on first call
+    if not llm_loaded and not load_llm():
+        # Fallback to smart rule-based agent
+        mahoraga_action = _smart_agent_action()
+        llm_raw = "[FALLBACK] rule-based"
+    else:
+        state_dict = env._get_state()
+        mahoraga_action, llm_raw = llm_choose_action(state_dict)
+
+    state, reward, done, info = env.step(mahoraga_action, enemy_category_override=player_action)
     action_name = ACTION_NAMES.get(env.last_action, "Unknown")
 
     turn_log = TurnLog(
@@ -324,28 +333,8 @@ def _do_step(action, llm_raw=None):
 
 @app.post("/api/step", response_model=CombatState)
 def step(req: StepRequest):
-    """Execute one manual turn of combat."""
-    return _do_step(req.action)
-
-
-@app.post("/api/auto-step", response_model=CombatState)
-def auto_step():
-    """Execute one turn using the trained LLM to choose the action."""
-    global env
-    if env is None:
-        env = MahoragaEnv(difficulty=current_difficulty)
-        env.reset()
-
-    # Load model on first call
-    if not llm_loaded and not load_llm():
-        # Fallback to smart rule-based agent
-        action = _smart_agent_action()
-        return _do_step(action, llm_raw="[FALLBACK] rule-based")
-
-    # Get LLM's state observation
-    state_dict = env._get_state()
-    action, raw_output = llm_choose_action(state_dict)
-    return _do_step(action, llm_raw=raw_output)
+    """Execute one turn of combat."""
+    return _do_step(req.player_action)
 
 
 @app.get("/api/model-status")

env/mahoraga_env.py

@@ -52,7 +52,7 @@ class MahoragaEnv:
             attack_history=list(self.attack_history)
         )
 
-    def step(self, action):
+    def step(self, action, enemy_category_override=None):
         validate_action(action)
         self.turn_number += 1
 
@@ -67,13 +67,27 @@ class MahoragaEnv:
             action = None  # Nullify action — agent wastes turn
 
         # 1. Enemy attacks first
-        attack = self.enemy.get_attack(
-            turn_number=self.turn_number,
-            resistances=self.resistances
-        )
-        category = attack["category"]
-        subtype = attack["subtype"]
-        ignore_armor = attack["ignore_armor"]
+        if enemy_category_override:
+            import random
+            from utils.constants import SUBTYPES, BASE_DAMAGE
+            category = enemy_category_override.upper()
+            subtype = random.choice(SUBTYPES[category])
+            ignore_armor = (subtype == "PIERCE")
+            attack = {
+                "category": category,
+                "subtype": subtype,
+                "damage": BASE_DAMAGE[category],
+                "ignore_armor": ignore_armor
+            }
+            self.enemy.turn += 1  # Advance internal turn
+        else:
+            attack = self.enemy.get_attack(
+                turn_number=self.turn_number,
+                resistances=self.resistances
+            )
+            category = attack["category"]
+            subtype = attack["subtype"]
+            ignore_armor = attack["ignore_armor"]
 
         enemy_damage = compute_enemy_damage(category, self.resistances, ignore_armor=ignore_armor)
         self.agent_hp = max(0, self.agent_hp - enemy_damage)

frontend/src/App.jsx

@@ -193,7 +193,7 @@ export default function App() {
     difficulty: "hard",
   };
 
-  async function doReset(diff) {
+  async function doReset(diff, clearLogs = true) {
     const d2use = diff || difficulty;
     setLoading(true);
     setAutoPlay(false);
@@ -208,7 +208,7 @@ export default function App() {
     } catch {
       setState({ ...MOCK_STATE, difficulty: d2use });
     }
-    setLogs([]); setLastLog(null);
+    if (clearLogs) { setLogs([]); setLastLog(null); }
     setWheelRot(0); prevRes.current = { Physical: 0, CE: 0, Technique: 0 };
     setLoading(false);
   }
@@ -256,8 +256,9 @@ export default function App() {
       const r = await fetch(`${API}/api/step`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ action }),
+        body: JSON.stringify({ player_action: action }),
       });
+      if (!r.ok) { setLoading(false); return; }
       const d = await r.json();
       processStepResult(d);
     } catch {
@@ -270,7 +271,12 @@ export default function App() {
     if (autoPlay && state && !state.done && !loading) {
       autoRef.current = setTimeout(async () => {
         try {
-          const r = await fetch(`${API}/api/auto-step`, { method: "POST" });
+          const r = await fetch(`${API}/api/step`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ player_action: null })
+          });
+          if (!r.ok) { setAutoPlay(false); return; }
           const d = await r.json();
           processStepResult(d);
         } catch { setAutoPlay(false); }
@@ -281,7 +287,12 @@ export default function App() {
 
   /* ── Stop auto-play when game ends ── */
   useEffect(() => {
-    if (state?.done) setAutoPlay(false);
+    if (state?.done) {
+      setAutoPlay(false);
+      // Auto-reset stats after 3 seconds, but keep combat logs
+      const t = setTimeout(() => doReset(null, false), 3000);
+      return () => clearTimeout(t);
+    }
   }, [state?.done]);
 
   /* ── Check model status on mount ── */
@@ -323,7 +334,7 @@ export default function App() {
           <div className="flex items-center gap-2">
             {autoPlay && (
               <span className="text-[8px] font-bold tracking-widest uppercase text-amber animate-pulse">
-                ● LLM AUTO
+                ● AUTO-PLAY
               </span>
             )}
             <span className={`text-[8px] font-bold tracking-wider uppercase px-1.5 py-0.5 rounded ${
@@ -351,62 +362,62 @@ export default function App() {
         {/* ═══════ MAIN BENTO GRID ═══════ */}
         <div className="flex-1 grid grid-cols-12 gap-2 px-2 py-1.5 min-h-0 overflow-hidden">
 
-          {/* ── COL 1-5: Left Column (Enemy + Mahoraga stacked) ── */}
+          {/* ── COL 1-5: Left Column (Boss + Player stacked) ── */}
           <div className="col-span-5 flex flex-col gap-2 min-h-0">
 
-            {/* Target Status: Enemy */}
+            {/* Boss: Mahoraga (LLM-controlled enemy) */}
             <div className="glass-panel p-3 shrink-0">
               <div className="flex items-center justify-between mb-2">
                 <div className="flex items-center gap-2">
-                  <span className="material-symbols-outlined text-outline text-base">target</span>
+                  <span className="material-symbols-outlined text-outline text-base">smart_toy</span>
                   <span className="text-[10px] font-bold tracking-[0.12em] uppercase text-red/70">
-                    TARGET STATUS
+                    ⚙ BOSS — MAHORAGA (AUTO)
                   </span>
                 </div>
-                <span className="font-mono text-[9px] text-muted">ID: E-9942</span>
               </div>
-              <HpBar current={state.enemy_hp} max={state.enemy_hp_max} color="red" label="Structural Integrity" />
+              <HpBar current={state.mahoraga_hp} max={state.mahoraga_hp_max} color="red" label="Boss Integrity" />
               <div className="flex gap-1.5 mt-2">
+                <StatChip label="Stack" value={
+                  <motion.span key={state.adaptation_stack} initial={{ scale: 1.5 }} animate={{ scale: 1 }}>
+                    {state.adaptation_stack}
+                  </motion.span>
+                } color="text-cyan" />
                 <StatChip
-                  label="Threat"
-                  value={state.enemy_hp < 400 ? "CRIT" : state.enemy_hp < 700 ? "HIGH" : "NOM"}
-                  color={state.enemy_hp < 400 ? "text-red" : state.enemy_hp < 700 ? "text-amber" : "text-cyan"}
-                />
-                <StatChip
-                  label="Phase"
-                  value={state.turn_number <= 5 ? "I" : state.turn_number <= 15 ? "II" : "III"}
-                />
-                <StatChip
-                  label="Distance"
-                  value="14.2m"
-                  color="text-muted"
+                  label="Heal CD"
+                  value={state.heal_cooldown === 0 ? "RDY" : state.heal_cooldown}
+                  color={state.heal_cooldown === 0 ? "text-green" : "text-red"}
                 />
+                <StatChip label="Adapt Rate" value="+2.4%/s" color="text-cyan" />
               </div>
             </div>
 
-            {/* Core: Mahoraga */}
+            {/* Player Status (user-controlled) */}
             <div className="glass-panel p-3 shrink-0">
               <div className="flex items-center justify-between mb-2">
                 <div className="flex items-center gap-2">
-                  <span className="material-symbols-outlined text-outline text-base">memory</span>
+                  <span className="material-symbols-outlined text-outline text-base">person</span>
                   <span className="text-[10px] font-bold tracking-[0.12em] uppercase text-green/70">
-                    CORE: MAHORAGA
+                    ⚔ YOU — PLAYER
                   </span>
                 </div>
+                <span className="font-mono text-[9px] text-muted">MANUAL CONTROL</span>
               </div>
-              <HpBar current={state.mahoraga_hp} max={state.mahoraga_hp_max} color="green" label="System Integrity" />
+              <HpBar current={state.enemy_hp} max={state.enemy_hp_max} color="green" label="Your Integrity" />
               <div className="flex gap-1.5 mt-2">
-                <StatChip label="Stack" value={
-                  <motion.span key={state.adaptation_stack} initial={{ scale: 1.5 }} animate={{ scale: 1 }}>
-                    {state.adaptation_stack}
-                  </motion.span>
-                } color="text-cyan" />
                 <StatChip
-                  label="Heal CD"
-                  value={state.heal_cooldown === 0 ? "RDY" : state.heal_cooldown}
-                  color={state.heal_cooldown === 0 ? "text-green" : "text-red"}
+                  label="Status"
+                  value={state.enemy_hp < 400 ? "CRIT" : state.enemy_hp < 700 ? "WARN" : "OK"}
+                  color={state.enemy_hp < 400 ? "text-red" : state.enemy_hp < 700 ? "text-amber" : "text-green"}
+                />
+                <StatChip
+                  label="Phase"
+                  value={state.turn_number <= 5 ? "I" : state.turn_number <= 15 ? "II" : "III"}
+                />
+                <StatChip
+                  label="Difficulty"
+                  value={difficulty.toUpperCase()}
+                  color={difficulty === "easy" ? "text-green" : difficulty === "medium" ? "text-amber" : "text-red"}
                 />
-                <StatChip label="Adapt Rate" value="+2.4%/s" color="text-cyan" />
               </div>
             </div>
 
@@ -419,9 +430,9 @@ export default function App() {
                 </span>
               </div>
               <div className="space-y-1.5">
-                <ResBar label="Physical" icon="fitness_center" value={state.resistances.Physical} flashing={flashRes === "Physical"} />
-                <ResBar label="CE" icon="bolt" value={state.resistances.CE} flashing={flashRes === "CE"} />
-                <ResBar label="Technique" icon="precision_manufacturing" value={state.resistances.Technique} flashing={flashRes === "Technique"} />
+                <ResBar label="Physical" icon="fitness_center" value={state.resistances?.Physical ?? 0} flashing={flashRes === "Physical"} />
+                <ResBar label="CE" icon="bolt" value={state.resistances?.CE ?? 0} flashing={flashRes === "CE"} />
+                <ResBar label="Technique" icon="precision_manufacturing" value={state.resistances?.Technique ?? 0} flashing={flashRes === "Technique"} />
               </div>
             </div>
           </div>
@@ -429,10 +440,10 @@ export default function App() {
           {/* ── COL 6-8: Center Column (Wheel + Phase + Tactics) ── */}
           <div className="col-span-3 flex flex-col gap-2 min-h-0">
 
-            {/* Enemy Phase Indicator */}
+            {/* Mahoraga Adaptation Phase */}
             <div className="glass-panel p-3 shrink-0">
               <div className="text-[8px] font-bold tracking-[0.2em] uppercase text-muted/50 mb-1.5">
-                ENEMY PHASE
+                MAHORAGA PHASE
               </div>
               <div className="flex gap-1">
                 {[
@@ -502,7 +513,7 @@ export default function App() {
 
             {/* Tactical Summary */}
             <div className="glass-panel p-2.5 shrink-0">
-              <div className="text-[7px] font-bold tracking-[0.15em] uppercase text-muted/40 mb-1">LAST INCOMING</div>
+              <div className="text-[7px] font-bold tracking-[0.15em] uppercase text-muted/40 mb-1">YOUR LAST ATTACK</div>
               {lastLog ? (
                 <div className="flex items-center gap-2">
                   <span className={`text-[9px] font-bold px-1.5 py-0.5 rounded ${catColor(lastLog.enemy_attack_type).bg} ${catColor(lastLog.enemy_attack_type).text} border ${catColor(lastLog.enemy_attack_type).border}`}>
@@ -528,13 +539,13 @@ export default function App() {
                 >
                   <div className="flex items-center gap-2">
                     <span className="material-symbols-outlined text-cyan text-sm">published_with_changes</span>
-                    <span className="text-[9px] font-bold tracking-[0.1em] uppercase text-cyan">ADAPTED</span>
+                    <span className="text-[9px] font-bold tracking-[0.1em] uppercase text-cyan">MAHORAGA ADAPTED</span>
                   </div>
                   <div className="text-xs font-black uppercase text-text mt-0.5">
-                    {lastLog.enemy_attack_type} COUNTERED
+                    YOUR {lastLog.enemy_attack_type} WAS COUNTERED
                   </div>
                   <div className="text-[9px] text-muted mt-0.5">
-                    Defensive parameters updated.
+                    Boss adapted to your attack type.
                   </div>
                 </motion.div>
               ) : lastLog ? (
@@ -548,12 +559,12 @@ export default function App() {
                   <div className="flex items-center gap-2">
                     <span className="material-symbols-outlined text-muted text-sm">sync_problem</span>
                     <span className="text-[9px] font-bold tracking-[0.1em] uppercase text-muted">
-                      {lastLog.mahoraga_action}
+                      MAHORAGA: {lastLog.mahoraga_action}
                     </span>
                   </div>
                   <div className="text-[10px] text-muted/60 mt-0.5 font-mono">
-                    DMG: <span className="text-red">{lastLog.damage_taken}</span> taken
-                    · <span className="text-green">{lastLog.damage_dealt}</span> dealt
+                    You dealt: <span className="text-green">{lastLog.damage_taken}</span>
+                    · Boss dealt: <span className="text-red">{lastLog.damage_dealt}</span>
                   </div>
                 </motion.div>
               ) : (
@@ -596,37 +607,36 @@ export default function App() {
                       key={i}
                       initial={{ opacity: 0, x: -8 }}
                       animate={{ opacity: 1, x: 0 }}
-                      className="flex gap-2 items-start py-1.5 border-b border-outline-variant/15 last:border-0"
+                      className="py-1.5 border-b border-outline-variant/15 last:border-0"
                     >
-                      <span className="font-mono text-[9px] text-outline-variant shrink-0 mt-0.5 w-6">
-                        T{l.turn}
-                      </span>
-                      {/* Category color dot */}
-                      <div className="shrink-0 mt-1.5" style={{ width: 4, height: 4, borderRadius: "50%", backgroundColor: catColor(l.enemy_attack_type).hex }} />
-                      <div className="flex-1 min-w-0">
-                        <div className="flex items-center gap-1">
-                          {l.correct_adaptation && (
-                            <span className="material-symbols-outlined text-cyan text-[11px]">
-                              published_with_changes
-                            </span>
-                          )}
-                          <span className={`text-[9px] font-bold tracking-wider uppercase ${l.correct_adaptation ? "text-cyan" : "text-muted/60"}`}>
-                            {l.correct_adaptation ? "ADAPTATION" : l.mahoraga_action}
-                          </span>
-                        </div>
-                        <div className="font-mono text-[9px] text-muted/70 mt-0.5">
-                          <span className={catColor(l.enemy_attack_type).text}>{l.enemy_subtype}</span>
-                          <span className="text-muted/30"> → </span>
-                          <span className="text-text/80">{l.mahoraga_action}</span>
-                          <span className="text-muted/30"> | </span>
-                          <span className="text-amber">{l.damage_dealt}d</span>
-                          <span className="text-muted/30"> · </span>
-                          <span className="text-red/70">{l.damage_taken}t</span>
-                        </div>
+                      <div className="flex items-center gap-1.5 mb-1">
+                        <span className="font-mono text-[9px] text-outline-variant shrink-0 w-6">T{l.turn}</span>
+                        <div className="shrink-0" style={{ width: 4, height: 4, borderRadius: "50%", backgroundColor: catColor(l.enemy_attack_type).hex }} />
+                        {l.correct_adaptation && (
+                          <span className="material-symbols-outlined text-cyan text-[11px]">published_with_changes</span>
+                        )}
+                        <span className={`font-mono text-[9px] font-bold shrink-0 ml-auto ${l.reward > 0 ? "text-green" : "text-red/60"}`}>
+                          {l.reward > 0 ? "+" : ""}{l.reward}
+                        </span>
+                      </div>
+                      {/* Player action line */}
+                      <div className="flex items-center gap-1.5 ml-7 mb-0.5">
+                        <span className="text-[8px] font-bold tracking-wider uppercase text-green/80 w-8">YOU</span>
+                        <span className="text-[9px] text-muted/40">→</span>
+                        <span className={`text-[9px] font-bold px-1 py-0.5 rounded ${catColor(l.enemy_attack_type).bg} ${catColor(l.enemy_attack_type).text} border ${catColor(l.enemy_attack_type).border}`}>
+                          {l.enemy_attack_type}
+                        </span>
+                        <span className="font-mono text-[8px] text-muted/50">{l.enemy_subtype}</span>
+                        <span className="font-mono text-[9px] text-green ml-auto">-{l.damage_taken} to boss</span>
+                      </div>
+                      {/* Mahoraga response line */}
+                      <div className="flex items-center gap-1.5 ml-7">
+                        <span className="text-[8px] font-bold tracking-wider uppercase text-red/80 w-8">BOSS</span>
+                        <span className="text-[9px] text-muted/40">→</span>
+                        <span className="text-[9px] font-bold text-text/80">{l.mahoraga_action}</span>
+                        {l.correct_adaptation && <span className="text-[8px] text-cyan font-bold">ADAPTED!</span>}
+                        {l.damage_dealt > 0 && <span className="font-mono text-[9px] text-red ml-auto">-{l.damage_dealt} to you</span>}
                       </div>
-                      <span className={`font-mono text-[9px] font-bold shrink-0 ${l.reward > 0 ? "text-green" : "text-red/60"}`}>
-                        {l.reward > 0 ? "+" : ""}{l.reward}
-                      </span>
                     </motion.div>
                   ))
                 )}
@@ -657,13 +667,10 @@ export default function App() {
 
           <div className="w-px h-5 bg-outline-variant/20 mx-0.5" />
 
-          {/* Manual actions */}
-          <Btn label="Adapt Physical" onClick={() => doStep(0)} disabled={done || autoPlay} />
-          <Btn label="Adapt CE" onClick={() => doStep(1)} disabled={done || autoPlay} />
-          <Btn label="Adapt Technique" onClick={() => doStep(2)} disabled={done || autoPlay} />
-          <div className="w-px h-5 bg-outline-variant/20 mx-0.5" />
-          <Btn label="Judgment Strike" onClick={() => doStep(3)} variant="danger" disabled={done || autoPlay} />
-          <Btn label="Regeneration" onClick={() => doStep(4)} variant="primary" disabled={done || autoPlay} />
+          {/* Manual player attacks */}
+          <Btn label="⚔ Physical" onClick={() => doStep("PHYSICAL")} disabled={done || autoPlay} />
+          <Btn label="⚔ CE" onClick={() => doStep("CE")} disabled={done || autoPlay} />
+          <Btn label="⚔ Technique" onClick={() => doStep("TECHNIQUE")} disabled={done || autoPlay} />
           <div className="w-px h-5 bg-outline-variant/20 mx-0.5" />
 
           {/* Auto-play + Reset */}
@@ -677,7 +684,7 @@ export default function App() {
                 : "bg-surface/60 text-muted border-outline-variant/30 hover:text-cyan hover:border-cyan/30"
             }`}
           >
-            {autoPlay ? "⏸ STOP" : "▶ LLM AUTO"}
+            {autoPlay ? "⏸ STOP AUTO" : "▶ AUTO-PLAY"}
           </motion.button>
           <Btn label="Reset" onClick={() => doReset()} variant="reset" />
 
@@ -714,7 +721,7 @@ export default function App() {
                 </div>
                 <div className="text-sm text-muted mb-1">{state.done_reason}</div>
                 <div className="font-mono text-[10px] text-muted mb-5">
-                  Enemy: {state.enemy_hp} HP | Mahoraga: {state.mahoraga_hp} HP | T{state.turn_number}
+                  You: {state.enemy_hp} HP | Mahoraga (Boss): {state.mahoraga_hp} HP | T{state.turn_number}
                 </div>
                 <Btn label="Deploy Again" onClick={doReset} variant="primary" />
               </motion.div>