merge: upstream/master (v1.114.2) into barrulus customizations

Conflict resolutions:
- public/modules/resample.js: accept upstream deletion (migrated to
  src/modules/resample.ts); re-apply Uint32Array fix for pack.cells.burg.
- public/modules/submap.js: accept upstream deletion (generator fully
  removed; only submap-tool.js remains and does not allocate cells).
- src/modules/ice.ts: port perf tweaks from the old ice.js - Set-based
  getNextId() and sequential nextId++ in generate() - onto the new TS
  class form.

Author: barrulus

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,33 +1,39 @@
 ---
 name: Bug report
 about: Report a problem
-title: ''
+title: ""
 labels: pending review
 assignees: Azgaar
-
 ---
 
-<!-- PLEASE FILL OUT THE FOLLOWING INFORMATION -->
 **Describe the bug**
+
 <!-- A clear and concise description of what the bug is -->
 
 **Steps to reproduce**
+
 <!-- Steps to reproduce the behavior. Please try to explain like to a 5-year-old person who had never used the tool before -->
+
 1. Click on ...
 2. Type ...
 3. See the ...
 
 **Expected behavior**
+
 <!-- A clear and concise description of what you expected to happen -->
 
 **.map file**
+
 <!-- Attach archived .map file (zip archive) so we can fix the issue faster -->
 
 **Screenshots**
+
 <!-- Add screenshots to help explain your problem -->
 
 **System**
+
 <!-- Please add all the details. Verison is displayed as a part of the page title and also at loading screen. If the issue is for desktop version, please specify it as well -->
- - Version: ...
- - Browser: ...
- - OS: ...
+
+- Version: ...
+- Browser: ...
+- OS: ...

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,14 +1,14 @@
 ---
 name: Feature request
 about: Suggest an idea
-title: ''
+title: ""
 labels: pending review
 assignees: Azgaar
-
 ---
 
 <-- BEFORE CREATING PLEASE CHECK THE TO-DO LIST-->
 <-- https://trello.com/b/7x832DG4/fantasy-map-generator ->>
+
 **Problem**
 <-- Is your feature request related to a problem? Please describe. Ex.: I'm always frustrated when ... -->
 

.github/copilot-instructions.md

@@ -1,118 +1,65 @@
 # Fantasy Map Generator
 
-Azgaar's Fantasy Map Generator is a web application for creating fantasy maps. It generates detailed fantasy worlds with countries, cities, rivers, biomes, and cultural elements.
-
-Always reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here.
-
-## Working Effectively
-
-- The project uses NPM, Vite, and TypeScript for development and building.
-- **Setup**: Run `npm install` to install dependencies (requires Node.js >= 24.0.0)
-- **Development**: Run `npm run dev` to start the Vite development server
-  - Access at: `http://localhost:5173` (Vite's default port)
-  - Hot module replacement (HMR) enabled - changes are reflected immediately
-- **Building**: Run `npm run build` to compile TypeScript and build for production
-  - TypeScript compilation runs first (`tsc`)
-  - Vite builds the application to `dist/` directory
-- **Preview**: Run `npm run preview` to preview the production build locally
-
-## Validation
-
-- Always manually validate any changes by:
-  1. Run `npm run dev` to start the development server (wait for "ready" message)
-  2. Navigate to the application in browser (typically `http://localhost:5173`)
-  3. Click the "►" button to open the menu and generate a new map
-  4. **CRITICAL VALIDATION**: Verify the map generates with countries, cities, roads, and geographic features
-  5. Test UI interaction: click "Layers" button, verify layer controls work
-  6. Test regeneration: click "New Map!" button, verify new map generates correctly
-- **Known Issues**: Google Analytics and font loading errors are normal (blocked external resources)
-- For production build validation: run `npm run build` followed by `npm run preview`
-
-## Repository Structure
-
-### Core Files
-
-- `package.json` - NPM package configuration with scripts and dependencies
-- `vite.config.ts` - Vite build configuration
-- `tsconfig.json` - TypeScript compiler configuration
-
-### Source Directories
-
-- `src/` - Source code directory (build input)
-  - `src/index.html` - Main application entry point
-  - `src/utils/` - TypeScript utility modules (migrated from JS)
-- `public/` - Static assets (copied to build output)
-  - `public/main.js` - Core application logic
-  - `public/versioning.js` - Version management and update handling
-  - `public/modules/` - Core functionality modules:
-    - `modules/ui/` - UI components (editors, tools, style management)
-    - `modules/dynamic/` - runtime modules (export, installation)
-    - `modules/renderers/` - drawing and rendering logic
-  - `public/styles/` - Visual style presets (JSON files)
-  - `public/libs/` - Third-party libraries (D3.js, TinyMCE, etc.)
-  - `public/images/` - Backgrounds, UI elements
-  - `public/charges/` - Heraldic symbols and coat of arms elements
-  - `public/config/` - Heightmap templates and configurations
-  - `public/heightmaps/` - Terrain generation data
-- `dist/` - Production build output (generated by `npm run build`)
-
-## Common Tasks
-
-### Making Code Changes
-
-1. **TypeScript files** (`src/utils/*.ts`):
-   - Edit TypeScript files in the `src/utils/` directory
-   - Changes are automatically recompiled and hot-reloaded in dev mode
-   - Run `npm run build` to verify TypeScript compilation succeeds
-2. **JavaScript files** (`public/*.js`, `public/modules/*.js`):
-   - Edit JavaScript files directly in the `public/` directory
-   - Changes are automatically reflected in dev mode via HMR
-   - **Note**: Core application logic is still in JavaScript and gradually being migrated
-3. **Always test map generation** after making changes
-4. Update version in `public/versioning.js` for all changes
-5. For production builds, update file hashes in `src/index.html` if needed (format: `file.js?v=1.108.1`)
-
-### Debugging Map Generation
-
-- Open browser developer tools console
-- Look for timing logs, e.g. "TOTAL: ~0.76s"
-- Map generation logs show each step (heightmap, rivers, states, etc.)
-- Error messages will indicate specific generation failures
-
-### Testing Different Map Types
-
-- Use "New Map!" button for quick regeneration
-- Access "Layers" menu to change map visualization
-- Available presets: Political, Cultural, Religions, Biomes, Heightmap, Physical, Military
-
-## Troubleshooting
-
-### Application Won't Load
-
-- Run `npm install` to ensure dependencies are installed
-- Run `npm run dev` to start the development server
-- Check console for JavaScript/TypeScript errors
-- Verify all files are present in repository
-- Ensure Node.js version >= 24.0.0 (`node --version`)
-
-### Build Failures
-
-- Check TypeScript compilation errors (`tsc` output)
-- Verify all dependencies are installed (`npm install`)
-- Check `tsconfig.json` for configuration issues
-- Look for import/module resolution errors
-
-### Map Generation Fails
-
-- Check browser console for error messages
-- Look for specific module failures in generation logs
-- Try refreshing page and generating new map
-- Verify build completed successfully if using production build
-
-### Performance Issues
-
-- Map generation should complete in ~1 second for standard configurations
-- If slower, check browser console for errors
-- Development mode may be slower due to HMR overhead
-
-Remember: This is a sophisticated application that generates complete fantasy worlds with political systems, geography, cultures, and detailed cartographic elements. The project is gradually migrating from vanilla JavaScript to TypeScript. Always validate that your changes preserve the core map generation functionality.
+Azgaar's Fantasy Map Generator is a client-only web application for creating fantasy maps. It generates detailed fantasy worlds with countries, cities, rivers, biomes, and cultural elements.
+
+Always reference these instructions first.
+
+# Architecture
+
+The codebase is gradually transitioning from **vanilla JavaScript to TypeScript** while maintaining compatibility with the existing generation pipeline and legacy `.map` user files.
+
+The expected **future architecture** is based on a separation between **world data**, **procedural generation**, **interactive editing**, and **rendering**.
+
+The application is conceptually divided into four main layers:
+
+- **State** — world data and style configuration, the single source of truth
+- **Generators** — procedural world simulation (model)
+- **Editors** — user-driven mutations of the world state (controllers)
+- **Renderer** — map visualization (view)
+
+Flow:
+settings → generators → world data → renderer
+UI → editors → world data → renderer
+
+### Layer responsibilities
+
+**State (world data)**  
+Stores all map data and style configuration.  
+The data layer must contain **no logic and no rendering code**.
+
+**Generators**  
+Implement the procedural world simulation and populate or update world data based on generation settings.
+
+**Editors**  
+Implement interactive editing tools used by the user.  
+Editors perform controlled mutations of the world state and can be viewed as **interactive generators**.
+
+**Renderer**  
+Converts the world state into **SVG or WebGL graphics**.  
+Rendering must be a **pure visualization step** and must **not modify world data**.
+
+# Working Effectively
+
+The project uses **NPM**, **Vite**, and **TypeScript** for development and building.
+
+## Setup
+
+Install dependencies: `npm install`
+
+Requirements: Node.js **>= 24.0.0**
+
+## Development
+
+Start the development server: `npm run dev`
+
+Access the application at: http://localhost:5173
+
+## Build
+
+Create a production build: `npm run build`
+
+Build steps:
+
+1. TypeScript compilation (`tsc`)
+2. Vite build
+3. Output written to `dist/`

.github/pull_request_template.md

@@ -1,23 +1,3 @@
 # Description
 
 <!-- Please include a summary of the change, motivation and context. It it's a but fix, add a reference in format #issue_number -->
-
-# Type of change
-
-<!-- Please put X into brackets of required option OR delete options that are not relevant -->
-
-- [ ] Bug fix
-- [ ] New feature
-- [ ] Refactoring / style
-- [ ] Documentation update / chore
-- [ ] Other (please describe)
-
-# Versioning
-
-<!-- Update the VERSION if you want the PR to be merged. Currently it's a manual 3-steps process:
-  * update VERSION in `versioning.js` using semver principle
-  * for all changed files update hash (the part after `?`) in place where file is requested (usually it's `index.html`)
-  * if the change can be really interesting for end-users, describe it inside the `showUpdateWindow()` function in `versioning.js` -->
-
-- [ ] Version is updated
-- [ ] Changed files hash is updated

.github/workflows/bump-version.yml

@@ -0,0 +1,86 @@
+name: Bump version on PR merge
+
+on:
+  pull_request:
+    branches: [master]
+    types: [closed]
+
+permissions:
+  contents: write
+  models: read
+
+jobs:
+  bump:
+    # Only run when the PR was actually merged (not just closed)
+    if: github.event.pull_request.merged == true
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          # Check out the base branch (master) so we are on a real branch, not
+          # a detached PR merge ref, which makes git push work without arguments.
+          ref: ${{ github.event.pull_request.base.ref }}
+          # fetch-depth 2 so HEAD~1 resolves to the pre-merge master commit
+          fetch-depth: 2
+          # Use a PAT so the pushed bump commit can trigger deploy.yml.
+          # Falls back to github.token if RELEASE_BOT_TOKEN is not configured
+          # (note: pushes with github.token won't re-trigger deploy.yml).
+          token: ${{ secrets.RELEASE_BOT_TOKEN || github.token }}
+
+      - name: Set up Node
+        uses: actions/setup-node@v6
+        with:
+          node-version: "24.x"
+          cache: npm
+
+      - name: Get PR diff
+        run: git diff HEAD~1 HEAD > /tmp/pr.diff
+
+      - name: AI-detect bump type from diff
+        id: bump
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          TYPE=$(node scripts/detect-bump-type.js --diff-file /tmp/pr.diff)
+          echo "type=$TYPE" >> "$GITHUB_OUTPUT"
+          echo "AI-determined bump type: $TYPE"
+
+      - name: Extract base version (master before this PR merged)
+        id: base
+        run: |
+          BASE=$(git show HEAD~1:public/versioning.js \
+            | grep -oP 'const VERSION = "\K[\d.]+')
+          echo "version=$BASE" >> "$GITHUB_OUTPUT"
+          echo "Base version: $BASE"
+
+      - name: Run version bump script
+        run: |
+          node scripts/bump-version.js ${{ steps.bump.outputs.type }} \
+            --base-version ${{ steps.base.outputs.version }}
+
+      - name: Commit and push bump
+        run: |
+          NEW_VERSION=$(node -e "
+            const m = require('fs')
+              .readFileSync('public/versioning.js', 'utf8')
+              .match(/const VERSION = \"([\d.]+)\"/);
+            console.log(m[1]);
+          ")
+
+          git config user.name  "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          # Stage versioning files + any public/**/*.js whose dynamic import
+          # hashes may have been refreshed by updatePublicJsDynamicImportHashes
+          git add public/versioning.js package.json package-lock.json src/index.html
+          git add public/ 2>/dev/null || true
+
+          if ! git diff --cached --quiet; then
+            git commit -m "chore: bump version to $NEW_VERSION"
+            git push
+            echo "Pushed version bump → $NEW_VERSION"
+          else
+            echo "Nothing changed, skipping commit."
+          fi

.gitignore

@@ -5,4 +5,8 @@
 /dist
 /coverage
 /playwright-report
-/test-results
+/test-results
+/_bmad
+/_bmad-output
+.github/agents/bmad-*
+.github/prompts/bmad-*

Dockerfile

@@ -12,9 +12,11 @@ RUN npm ci
 # Copy source code
 COPY ./src ./src
 COPY ./public ./public
-COPY vite.config.js .
+COPY tsconfig.json .
+COPY vite.config.ts .
 
 # Build the application
+ENV NETLIFY=true
 RUN npm run build
 
 # Production stage