diff --git a/docs/circular-deps.txt b/docs/circular-deps.txt
index 273b465..befb730 100644
--- a/docs/circular-deps.txt
+++ b/docs/circular-deps.txt
@@ -1,4 +1,4 @@
 # Circular Dependencies
-Generated: 2026-05-28T19:01:33.787Z
+Generated: 2026-05-28T19:24:11.154Z
 
 No circular dependencies found. ✅
diff --git a/docs/dependency-graph.json b/docs/dependency-graph.json
index ef02588..86e7b2b 100644
--- a/docs/dependency-graph.json
+++ b/docs/dependency-graph.json
@@ -1,6 +1,6 @@
 {
   "_meta": {
-    "generated": "2026-05-28T19:01:32.036Z",
+    "generated": "2026-05-28T19:24:09.393Z",
     "description": "Import dependency graph for src/lib/game. Keys are files, values are arrays of files they import.",
     "usage": "To find what a file affects, search for its path in the VALUES. To find what a file depends on, look at its KEY entry."
   },
diff --git a/src/app/page.tsx b/src/app/page.tsx
index d524175..4be3002 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -171,12 +171,6 @@ export default function ManaLoopGame() {
   const [mounted, setMounted] = useState(false);
   useEffect(() => { setMounted(true); }, []); // eslint-disable-line react-hooks/set-state-in-effect
 
-  useEffect(() => {
-    if (spireMode) {
-      setActiveTab('spells'); // eslint-disable-line react-hooks/set-state-in-effect
-    }
-  }, [spireMode]);
-
   if (gameOver) {
     return <GameOverScreen day={day} hour={hour} insightGained={loopInsight} totalInsight={insight} />;
   }
diff --git a/src/components/game/debug/GameStateDebug.tsx b/src/components/game/debug/GameStateDebug.tsx
index 70827e4..9fb4a08 100644
--- a/src/components/game/debug/GameStateDebug.tsx
+++ b/src/components/game/debug/GameStateDebug.tsx
@@ -165,7 +165,7 @@ function TimeControlSection({ day, hour, paused, onSetDay, onTogglePause }: {
       </CardHeader>
       <CardContent className="space-y-3">
         <div className="text-xs text-gray-400">
-          Current: Day {day}, Hour {hour}
+          Current: Day {day}, Hour {Number.isFinite(hour) ? hour.toFixed(2) : '0.00'}
         </div>
         <div className="flex gap-2 flex-wrap">
           <Button size="sm" variant="outline" onClick={() => onSetDay(1)}>Day 1</Button>
diff --git a/src/components/game/tabs/DisciplineCard.tsx b/src/components/game/tabs/DisciplineCard.tsx
index 19160ab..e5caa6a 100644
--- a/src/components/game/tabs/DisciplineCard.tsx
+++ b/src/components/game/tabs/DisciplineCard.tsx
@@ -13,6 +13,7 @@ export interface DisciplineCardProps {
   definition: DisciplineDefinition;
   xp: number;
   paused: boolean;
+  activeIds: string[];
   concurrentLimit: number;
   isLocked: boolean;
   missingPrereqs: string[];
@@ -23,7 +24,7 @@ export interface DisciplineCardProps {
 // ─── Component ────────────────────────────────────────────────────────────────
 
 export const DisciplineCard: React.FC<DisciplineCardProps> = ({
-  definition, xp, paused: isPaused, concurrentLimit,
+  definition, xp, paused: isPaused, activeIds, concurrentLimit,
   isLocked, missingPrereqs, missingSourceMana, onToggle,
 }) => {
   const {
@@ -41,6 +42,12 @@ export const DisciplineCard: React.FC<DisciplineCardProps> = ({
   const manaColor = elementDef?.color ?? '#888888';
   const manaIcon = elementDef?.sym ?? '✦';
   const manaName = elementDef?.name ?? manaType;
+  const isActive = activeIds.includes(id);
+  const activeNotPaused = activeIds.filter((aid) => {
+    // Count how many active disciplines are not paused
+    return aid === id ? !isPaused : true;
+  }).length;
+  const atConcurrentLimit = !isActive && activeIds.length >= concurrentLimit;
   const effectiveIsLocked = isLocked || missingSourceMana.length > 0;
   const statBonusLabel = statBonus.label;
 
@@ -140,9 +147,16 @@ export const DisciplineCard: React.FC<DisciplineCardProps> = ({
       </div>
 
       {/* Lock Reasons */}
-      {effectiveIsLocked && (missingPrereqs.length > 0 || missingSourceMana.length > 0) && (
+      {(effectiveIsLocked || atConcurrentLimit) && (missingPrereqs.length > 0 || missingSourceMana.length > 0 || atConcurrentLimit) && (
         <div className="mt-2 text-xs text-red-400">
-          <strong>Requires:</strong> {[...missingPrereqs, ...missingSourceMana].join(', ')}
+          {atConcurrentLimit && <div><strong>At limit:</strong> {activeIds.length}/{concurrentLimit} disciplines active</div>}
+          {missingPrereqs.length > 0 && <div><strong>Requires:</strong> {missingPrereqs.join(', ')}</div>}
+          {missingSourceMana.length > 0 && <div><strong>Missing mana:</strong> {missingSourceMana.join(', ')}</div>}
+        </div>
+      )}
+      {atConcurrentLimit && missingPrereqs.length === 0 && missingSourceMana.length === 0 && (
+        <div className="mt-2 text-xs text-amber-400">
+          <strong>At limit:</strong> {activeIds.length}/{concurrentLimit} disciplines active. Gain XP to unlock more slots.
         </div>
       )}
 
@@ -150,17 +164,23 @@ export const DisciplineCard: React.FC<DisciplineCardProps> = ({
       <div className="mt-4 flex justify-end">
         <button
           onClick={() => onToggle(id, isPaused)}
-          disabled={effectiveIsLocked}
+          disabled={effectiveIsLocked || atConcurrentLimit}
           className={clsx(
             'rounded px-3 py-1 text-sm font-medium',
-            effectiveIsLocked
+            effectiveIsLocked || atConcurrentLimit
               ? 'bg-gray-600 text-gray-400 cursor-not-allowed'
               : isPaused
                 ? 'bg-yellow-600 text-white hover:bg-yellow-500'
                 : 'bg-blue-600 text-white hover:bg-blue-500',
           )}
         >
-          {effectiveIsLocked ? 'Locked' : isPaused ? 'Start Practicing' : 'Stop Practicing'}
+          {effectiveIsLocked
+            ? 'Locked'
+            : atConcurrentLimit
+              ? `At Limit (${activeIds.length}/${concurrentLimit})`
+              : isPaused
+                ? 'Start Practicing'
+                : 'Stop Practicing'}
         </button>
       </div>
     </div>
diff --git a/src/components/game/tabs/DisciplinesTab.tsx b/src/components/game/tabs/DisciplinesTab.tsx
index 00eee79..4927a7d 100644
--- a/src/components/game/tabs/DisciplinesTab.tsx
+++ b/src/components/game/tabs/DisciplinesTab.tsx
@@ -41,6 +41,7 @@ const ATTUNEMENT_TABS: AttunementTab[] = [
 interface CardWrapperProps {
   disc: DisciplineDefinition;
   disciplines: Record<string, { xp: number; paused: boolean }>;
+  activeIds: string[];
   concurrentLimit: number;
   elements: ReturnType<typeof useManaStore.getState>['elements'];
   signedPacts: ReturnType<typeof usePrestigeStore.getState>['signedPacts'];
@@ -48,15 +49,16 @@ interface CardWrapperProps {
 }
 
 const CardWrapper: React.FC<CardWrapperProps> = ({
-  disc, disciplines, concurrentLimit, elements, onToggle,
+  disc, disciplines, activeIds, concurrentLimit, elements, signedPacts, onToggle,
 }) => {
   const discState = disciplines[disc.id] ?? { xp: 0, paused: true };
-  const prereqCheck = checkDisciplinePrerequisites(disc, disciplines, ALL_DISCIPLINES, elements);
+  const prereqCheck = checkDisciplinePrerequisites(disc, disciplines, ALL_DISCIPLINES, elements, signedPacts);
   return (
     <DisciplineCard
       definition={disc}
       xp={discState.xp}
       paused={discState.paused}
+      activeIds={activeIds}
       concurrentLimit={concurrentLimit}
       isLocked={!prereqCheck.canProceed}
       missingPrereqs={prereqCheck.missingPrereqs}
@@ -129,6 +131,7 @@ export const DisciplinesTab: React.FC = () => {
               key={disc.id}
               disc={disc}
               disciplines={disciplines}
+              activeIds={activeIds}
               concurrentLimit={concurrentLimit}
               elements={elements}
               signedPacts={signedPacts}
diff --git a/src/components/game/tabs/SpireCombatPage/SpireCombatPage.tsx b/src/components/game/tabs/SpireCombatPage/SpireCombatPage.tsx
index 6efb128..00a54d4 100644
--- a/src/components/game/tabs/SpireCombatPage/SpireCombatPage.tsx
+++ b/src/components/game/tabs/SpireCombatPage/SpireCombatPage.tsx
@@ -113,8 +113,7 @@ export function SpireCombatPage() {
     setRoomsCleared(0);
     const newRoom = generateSpireFloorState(currentFloor, 0, totalRooms);
     setCurrentRoom(newRoom);
-    setAction('climb');
-  }, [currentFloor, totalRooms, setCurrentRoom, setAction]);
+  }, [currentFloor, totalRooms, setCurrentRoom]);
 
   const _handleRoomCleared = () => {
     const nextRoomIndex = roomsCleared + 1;
diff --git a/src/components/game/tabs/StatsTab/ElementStatsSection.tsx b/src/components/game/tabs/StatsTab/ElementStatsSection.tsx
index 9fa0a86..1c867fa 100644
--- a/src/components/game/tabs/StatsTab/ElementStatsSection.tsx
+++ b/src/components/game/tabs/StatsTab/ElementStatsSection.tsx
@@ -5,7 +5,7 @@ import { DebugName } from '@/components/game/debug/debug-context';
 import { Separator } from '@/components/ui/separator';
 import { FlaskConical } from 'lucide-react';
 import { ELEMENTS } from '@/lib/game/constants';
-import { usePrestigeStore, useManaStore } from '@/lib/game/stores';
+import { usePrestigeStore, useManaStore, fmtDec } from '@/lib/game/stores';
 import type { ElementState } from '@/lib/game/types';
 
 interface ElementStatsSectionProps {
@@ -54,7 +54,7 @@ export function ElementStatsSection({ elemMax }: ElementStatsSectionProps) {
               return (
                 <div key={id} className="p-2 rounded transition-colors" style={{ border: `1px solid ${def?.color}30`, background: 'var(--bg-sunken)/50', textAlign: 'center' }}>
                   <div className="text-lg" style={{ color: def?.color }}>{def?.sym}</div>
-                  <div className="text-xs" style={{ color: 'var(--text-muted)' }}>{state.current}/{state.max}</div>
+                  <div className="text-xs" style={{ color: 'var(--text-muted)' }}>{fmtDec(state.current, 2)}/{fmtDec(state.max, 0)}</div>
                 </div>
               );
             })}
diff --git a/src/components/game/tabs/StatsTab/ManaStatsSection.tsx b/src/components/game/tabs/StatsTab/ManaStatsSection.tsx
index 7d130ea..f8737f9 100644
--- a/src/components/game/tabs/StatsTab/ManaStatsSection.tsx
+++ b/src/components/game/tabs/StatsTab/ManaStatsSection.tsx
@@ -90,7 +90,7 @@ export function ManaStatsSection({ stats, elemMax }: ManaStatsSectionProps) {
               <span style={{ color: 'var(--text-secondary)' }}>2/hr</span>
             </div>
             <div className="flex justify-between text-sm font-semibold border-t border-[var(--border-subtle)] pt-2">
-              <span style={{ color: 'var(--text-secondary)' }}>Base Regen:</span>
+              <span style={{ color: 'var(--text-secondary)' }}>Computed Base Regen:</span>
               <span style={{ color: 'var(--mana-water)' }}>{fmtDec(baseRegen, 2)}/hr</span>
             </div>
             {upgradeEffects.regenBonus > 0 && (
diff --git a/src/lib/game/stores/crafting-initial-state.ts b/src/lib/game/stores/crafting-initial-state.ts
index 0d946d8..1942e4a 100644
--- a/src/lib/game/stores/crafting-initial-state.ts
+++ b/src/lib/game/stores/crafting-initial-state.ts
@@ -3,6 +3,38 @@
 
 import * as CraftingUtils from '../crafting-utils';
 import type { EquipmentInstance } from '../types';
+import type { CraftingState } from './craftingStore.types';
+
+/**
+ * Create the full default state for the crafting store.
+ * Used by both initial store creation and resetCrafting().
+ */
+export function createDefaultCraftingState(): CraftingState {
+  const initial = createInitialEquipmentInstances();
+  return {
+    designProgress: null,
+    designProgress2: null,
+    preparationProgress: null,
+    applicationProgress: null,
+    equipmentCraftingProgress: null,
+    enchantmentDesigns: [],
+    unlockedEffects: [],
+    equippedInstances: initial.equippedInstances,
+    equipmentInstances: initial.instances,
+    lootInventory: {
+      materials: {},
+      blueprints: [],
+    },
+    enchantmentSelection: {
+      selectedEquipmentType: null,
+      selectedEffects: [],
+      designName: '',
+      selectedDesign: null,
+      selectedEquipmentInstance: null,
+    },
+    lastError: null,
+  };
+}
 
 export function createInitialEquipmentInstances() {
   const staffId = CraftingUtils.generateInstanceId();
diff --git a/src/lib/game/stores/craftingStore.ts b/src/lib/game/stores/craftingStore.ts
index 4fa1e05..2fef9fc 100644
--- a/src/lib/game/stores/craftingStore.ts
+++ b/src/lib/game/stores/craftingStore.ts
@@ -15,7 +15,7 @@ import * as CraftingEquipment from '../crafting-equipment';
 import { equipItem as equipItemAction, unequipItem as unequipItemAction } from '../crafting-actions/equipment-actions';
 import { ErrorCode } from '../utils/result';
 import { createSafeStorage } from '../utils/safe-persist';
-import { createInitialEquipmentInstances } from './crafting-initial-state';
+import { createDefaultCraftingState } from './crafting-initial-state';
 import {
   getFabricatorRecipe,
   deductFabricatorMana,
@@ -28,30 +28,9 @@ import { processEquipmentCraftingTick } from './crafting-equipment-tick';
 export const useCraftingStore = create<CraftingStore>()(
   persist(
     (set, get) => {
-      const initial = createInitialEquipmentInstances();
+      const defaultState = createDefaultCraftingState();
       return {
-        // Initial state
-        designProgress: null,
-        designProgress2: null,
-        preparationProgress: null,
-        applicationProgress: null,
-        equipmentCraftingProgress: null,
-        enchantmentDesigns: [],
-        unlockedEffects: [],
-        equippedInstances: initial.equippedInstances,
-        equipmentInstances: initial.instances,
-        lootInventory: {
-          materials: {},
-          blueprints: [],
-        },
-        enchantmentSelection: {
-          selectedEquipmentType: null,
-          selectedEffects: [],
-          designName: '',
-          selectedDesign: null,
-          selectedEquipmentInstance: null,
-        },
-        lastError: null,
+        ...defaultState,
 
         // Actions
         setDesignProgress: (progress) => set({ designProgress: progress }),
@@ -369,6 +348,10 @@ export const useCraftingStore = create<CraftingStore>()(
           const state = get();
           return processEquipmentCraftingTick(state, set as unknown as (partial: Partial<CraftingState>) => void);
         },
+
+        resetCrafting: () => {
+          set(createDefaultCraftingState());
+        },
       };
     },
     {
diff --git a/src/lib/game/stores/craftingStore.types.ts b/src/lib/game/stores/craftingStore.types.ts
index c55bfc0..8e9569e 100644
--- a/src/lib/game/stores/craftingStore.types.ts
+++ b/src/lib/game/stores/craftingStore.types.ts
@@ -73,6 +73,7 @@ export interface CraftingActions {
   clearLastError: () => void;
   unlockEffects: (effectIds: string[]) => void;
   processEquipmentCraftingTick: () => { completed: boolean; logMessage?: string };
+  resetCrafting: () => void;
 }
 
 export type CraftingStore = CraftingState & CraftingActions;
diff --git a/src/lib/game/stores/discipline-slice.ts b/src/lib/game/stores/discipline-slice.ts
index 3cf4e7f..685acd7 100644
--- a/src/lib/game/stores/discipline-slice.ts
+++ b/src/lib/game/stores/discipline-slice.ts
@@ -95,14 +95,8 @@ export const useDisciplineStore = create<DisciplineStore>()(
           if (nonPaused >= s.concurrentLimit) return s;
           if (!canProceedDiscipline(def, existing, gameState)) return s;
 
-          // Invoker disciplines require at least one signed guardian pact
-          if (def.attunement === 'invoker') {
-            const signedPacts = gameState?.signedPacts || [];
-            if (signedPacts.length === 0) return s;
-          }
-
           // Check discipline prerequisites (requires field → discipline XP or mana type unlock)
-          const prereqCheck = checkDisciplinePrerequisites(def, s.disciplines, ALL_DISCIPLINES, gameState?.elements);
+          const prereqCheck = checkDisciplinePrerequisites(def, s.disciplines, ALL_DISCIPLINES, gameState?.elements, gameState?.signedPacts);
           if (!prereqCheck.canProceed) return s;
 
           // For conversion disciplines: gate on having all source mana types unlocked
diff --git a/src/lib/game/stores/gameActions.ts b/src/lib/game/stores/gameActions.ts
index 13e09bb..fb4d9e4 100644
--- a/src/lib/game/stores/gameActions.ts
+++ b/src/lib/game/stores/gameActions.ts
@@ -4,6 +4,9 @@ import { useUIStore } from './uiStore';
 import { usePrestigeStore } from './prestigeStore';
 import { useManaStore } from './manaStore';
 import { useCombatStore } from './combatStore';
+import { useDisciplineStore } from './discipline-slice';
+import { useAttunementStore } from './attunementStore';
+import { useCraftingStore } from './craftingStore';
 import { computeDisciplineEffects } from '../effects/discipline-effects';
 
 // Exact localStorage keys matching each store's persist config `name`
@@ -32,6 +35,9 @@ export const createResetGame = (set: (state: Partial<GameCoordinatorState>) => v
   usePrestigeStore.getState().resetPrestige();
   useManaStore.getState().resetMana({});
   useCombatStore.getState().resetCombat(startFloor);
+  useDisciplineStore.getState().resetDisciplines();
+  useAttunementStore.getState().resetAttunements();
+  useCraftingStore.getState().resetCrafting();
 
   set({
     ...initialState,
diff --git a/src/lib/game/utils/discipline-math.ts b/src/lib/game/utils/discipline-math.ts
index 92bead7..ef9de35 100644
--- a/src/lib/game/utils/discipline-math.ts
+++ b/src/lib/game/utils/discipline-math.ts
@@ -117,6 +117,7 @@ export function checkDisciplinePrerequisites(
   allDisciplines: Record<string, DisciplineState>,
   allDefinitions: DisciplineDefinition[],
   elements?: Record<string, { unlocked: boolean }>,
+  signedPacts?: number[],
 ): { canProceed: boolean; missingPrereqs: string[] } {
   if (!discipline.requires || discipline.requires.length === 0) {
     return { canProceed: true, missingPrereqs: [] };
@@ -127,7 +128,9 @@ export function checkDisciplinePrerequisites(
   for (const reqId of discipline.requires) {
     // Special case: 'signed_pact' requires at least one guardian pact
     if (reqId === 'signed_pact') {
-      missingPrereqs.push('Signed guardian pact');
+      if (!signedPacts || signedPacts.length === 0) {
+        missingPrereqs.push('Signed guardian pact');
+      }
       continue;
     }