build(windows): per-build releases layout and Forge under windows/

- Add build-layout.cjs for RELEASE_BUILD_ID, BUILD_STAMP, releases/builder/<id>/eb-output staging, and fixed dev/ folder name for non-installer artifacts.\n- run-win-electron-builder.cjs sets env and runs cleanup; build-with-progress.cjs passes HSP_EB_OUTPUT and directories.output to electron-builder.\n- cleanup.cjs reads HSP_EB_OUTPUT, moves leftover staging into dev/, drops eb-output after organize.\n- Relocate Forge config and make-with-stamp to app/windows/forge/; package.json config.forge points there; add forge-cleanup.cjs for parity with builder layout.\n- NSIS runAfterFinish true (package.json + Forge maker) so the app can launch after install.\n- CI workflows read installer from releases/builder/<id>/ and zip/yml from dev/; refresh docs for paths and commands.

Made-with: Cursor

Author: anriltine

.github/workflows/releases-forge-from-folder.yml

@@ -1,5 +1,5 @@
 # Build Windows installer with Electron Forge on CI, publish GitHub Release, notify /api/releases.
-name: Windows release (Forge CI build)
+name: forge .exe build
 
 on:
   workflow_dispatch:
@@ -45,108 +45,58 @@ jobs:
 
       - name: Build Forge Windows artifacts
         env:
-          # Принудительно отключаем публикацию для electron-builder внутри Forge
           ELECTRON_PUBLISH: never
-          # Дополнительная заглушка: передаем пустой конфиг публикаций в формате JSON
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: npm run make:win:forge
 
-      - name: Locate Forge artifacts and normalize names
+      # forge-cleanup writes releases/forge/<build_id>_forge/ (installer at root; zip + yml in dev/).
+      # Stage flat copies under releases/electron/<build_id>_forge/ for GitHub upload.
+      - name: Locate Forge artifacts and stage under releases/electron
         id: artifact
         run: |
           set -euo pipefail
-          shopt -s globstar nullglob
-
           rid="${{ steps.meta.outputs.release_id }}"
-          stage_dir="releases/$rid"
+          src_dir="releases/forge/$rid"
+          dev_dir="$src_dir/dev"
+          stage_dir="releases/electron/$rid"
           mkdir -p "$stage_dir"
 
-          forge_root="releases/forge/artifacts"
-          if [[ ! -d "$forge_root" ]]; then
-            echo "Forge output folder not found: $forge_root"
-            exit 1
-          fi
-
-          # Collect outputs under Forge make folders.
-          exes=( "$forge_root"/**/make/**/*.exe )
-          zips=( "$forge_root"/**/make/**/*.zip )
-          ymls=( "$forge_root"/**/make/**/latest.yml )
-          zip_ymls=( "$forge_root"/**/make/**/zip-latest.yml )
-
-          # Pick installer exe (prefer names that look like setup/installer).
-          exe=""
-          for f in "${exes[@]}"; do
-            b="$(basename "$f")"
-            lb="${b,,}"
-            if [[ "$lb" == *setup*.exe || "$lb" == *installer*.exe ]]; then
-              exe="$f"
-              break
-            fi
-          done
-          if [[ -z "$exe" && ${#exes[@]} -gt 0 ]]; then
-            exe="${exes[0]}"
-          fi
+          exe="$(ls -1 "$src_dir"/HyperlinksSpaceAppInstaller_*.exe 2>/dev/null | head -n 1 || true)"
           if [[ -z "$exe" || ! -f "$exe" ]]; then
-            echo "No Forge Windows installer .exe found under $forge_root/**/make/"
+            echo "Expected timestamped installer in $src_dir (forge-cleanup; set RELEASE_BUILD_ID=$rid)."
+            find releases -maxdepth 6 -type f 2>/dev/null || true
             exit 1
           fi
-
-          # Prefer portable zip if present.
-          zip=""
-          if [[ ${#zips[@]} -gt 0 ]]; then
-            zip="${zips[0]}"
-          fi
-
-          yml=""
-          if [[ ${#ymls[@]} -gt 0 ]]; then
-            yml="${ymls[0]}"
+          zip="$(ls -1 "$dev_dir"/HyperlinksSpaceApp_*.zip 2>/dev/null | head -n 1 || true)"
+          if [[ -z "$zip" || ! -f "$zip" ]]; then
+            echo "Portable zip required in $dev_dir (Forge zip maker + forge-cleanup)."
+            find "$dev_dir" -maxdepth 1 -type f 2>/dev/null || true
+            exit 1
           fi
-
-          zip_yml=""
-          if [[ ${#zip_ymls[@]} -gt 0 ]]; then
-            zip_yml="${zip_ymls[0]}"
+          yml="$dev_dir/latest.yml"
+          zip_yml="$dev_dir/zip-latest.yml"
+          if [[ ! -f "$yml" ]]; then
+            echo "latest.yml missing next to installer — electron-updater needs it on the GitHub Release."
+            exit 1
           fi
-
-          stamp="${rid#build_}"
-          stamp="${stamp%_forge}"
-
-          exe_name="HyperlinksSpaceAppInstaller_${stamp}_forge.exe"
+          exe_name="$(basename "$exe")"
+          zip_name="$(basename "$zip")"
           exe_out="$stage_dir/$exe_name"
+          zip_out="$stage_dir/$zip_name"
+          yml_out="$stage_dir/latest.yml"
+          zip_yml_out="$stage_dir/zip-latest.yml"
           cp "$exe" "$exe_out"
-
-          zip_name=""
-          zip_out=""
-          if [[ -n "$zip" && -f "$zip" ]]; then
-            base_zip="$(basename "$zip")"
-            zip_name="${base_zip%.zip}_forge.zip"
-            zip_out="$stage_dir/$zip_name"
-            cp "$zip" "$zip_out"
-          fi
-
-          yml_name=""
-          yml_out=""
-          if [[ -n "$yml" && -f "$yml" ]]; then
-            yml_name="latest_forge.yml"
-            yml_out="$stage_dir/$yml_name"
-            cp "$yml" "$yml_out"
-          fi
-
-          zip_yml_name=""
-          zip_yml_out=""
-          if [[ -n "$zip_yml" && -f "$zip_yml" ]]; then
-            zip_yml_name="zip-latest_forge.yml"
-            zip_yml_out="$stage_dir/$zip_yml_name"
+          cp "$zip" "$zip_out"
+          cp "$yml" "$yml_out"
+          if [[ -f "$zip_yml" ]]; then
             cp "$zip_yml" "$zip_yml_out"
           fi
-
           echo "exe_path=$exe_out" >> "$GITHUB_OUTPUT"
           echo "exe_name=$exe_name" >> "$GITHUB_OUTPUT"
           echo "zip_path=$zip_out" >> "$GITHUB_OUTPUT"
           echo "zip_name=$zip_name" >> "$GITHUB_OUTPUT"
           echo "yml_path=$yml_out" >> "$GITHUB_OUTPUT"
-          echo "yml_name=$yml_name" >> "$GITHUB_OUTPUT"
           echo "zip_yml_path=$zip_yml_out" >> "$GITHUB_OUTPUT"
-          echo "zip_yml_name=$zip_yml_name" >> "$GITHUB_OUTPUT"
           echo "release_id=$rid" >> "$GITHUB_OUTPUT"
 
       - name: Check if GitHub release already exists
@@ -163,6 +113,56 @@ jobs:
             echo "exists=false" >> "$GITHUB_OUTPUT"
           fi
 
+      - name: Preflight checks and artifact summary
+        if: steps.exists.outputs.exists != 'true'
+        id: preflight
+        run: |
+          set -euo pipefail
+          rid="${{ steps.artifact.outputs.release_id }}"
+          exe="${{ steps.artifact.outputs.exe_path }}"
+          zip="${{ steps.artifact.outputs.zip_path }}"
+          yml="${{ steps.artifact.outputs.yml_path }}"
+          zip_yml="${{ steps.artifact.outputs.zip_yml_path }}"
+          stage_dir="releases/electron/$rid"
+
+          [[ -d "$stage_dir" ]] || { echo "Stage dir missing: $stage_dir"; exit 1; }
+          [[ -f "$exe" ]] || { echo "Installer missing: $exe"; exit 1; }
+          [[ -f "$zip" ]] || { echo "Portable zip missing: $zip"; exit 1; }
+          [[ -f "$yml" ]] || { echo "latest.yml missing: $yml"; exit 1; }
+
+          exe_name="$(basename "$exe")"
+          zip_name="$(basename "$zip")"
+          yml_name="$(basename "$yml")"
+
+          [[ "$exe_name" == HyperlinksSpaceAppInstaller_*.exe ]] || {
+            echo "Unexpected installer name: $exe_name"; exit 1;
+          }
+          [[ "$zip_name" == HyperlinksSpaceApp_*.zip ]] || {
+            echo "Unexpected zip name: $zip_name"; exit 1;
+          }
+          [[ "$yml_name" == "latest.yml" ]] || {
+            echo "Unexpected yml name: $yml_name"; exit 1;
+          }
+
+          app_version="$(echo "$zip_name" | sed -E 's/^HyperlinksSpaceApp_(.+)\.zip$/\1/')"
+          if [[ -z "$app_version" || "$app_version" == "$zip_name" ]]; then
+            app_version="unknown"
+          fi
+          echo "app_version=$app_version" >> "$GITHUB_OUTPUT"
+
+          echo "Preflight OK (Forge):"
+          echo "  release_id: $rid"
+          echo "  app_version: $app_version"
+          echo "  stage_dir: $stage_dir"
+          echo "  installer: $exe"
+          echo "  portable_zip: $zip"
+          echo "  latest_yml: $yml"
+          if [[ -n "$zip_yml" && -f "$zip_yml" ]]; then
+            echo "  zip_latest_yml: $zip_yml"
+          else
+            echo "  zip_latest_yml: (missing, optional)"
+          fi
+
       - name: Create GitHub release and upload Forge artifacts
         if: steps.exists.outputs.exists != 'true'
         id: create
@@ -175,27 +175,18 @@ jobs:
           zip="${{ steps.artifact.outputs.zip_path }}"
           yml="${{ steps.artifact.outputs.yml_path }}"
           zip_yml="${{ steps.artifact.outputs.zip_yml_path }}"
-
-          if [[ ! -f "$exe" ]]; then
-            echo "Installer artifact missing: $exe"
-            exit 1
-          fi
-
-          upload=( "$exe" )
-          if [[ -n "$yml" && -f "$yml" ]]; then
-            upload+=( "$yml" )
-          fi
-          if [[ -n "$zip" && -f "$zip" ]]; then
-            upload+=( "$zip" )
-          fi
-          if [[ -n "$zip_yml" && -f "$zip_yml" ]]; then
+          upload=( "$exe" "$yml" "$zip" )
+          if [[ -f "$zip_yml" ]]; then
             upload+=( "$zip_yml" )
+          else
+            echo "Warning: zip-latest.yml missing (forge-cleanup should generate it when zip exists)."
           fi
-
+          echo "Publishing release $rid (app_version=${{ steps.preflight.outputs.app_version }})"
+          printf 'Assets:\n- %s\n' "${upload[@]}"
           gh release create "$rid" "${upload[@]}" \
             --repo "${{ github.repository }}" \
             --title "$rid" \
-            --notes "Windows Forge build on GitHub Actions. Assets are Forge artifacts normalized with _forge suffix."
+            --notes "Windows Forge build on GitHub Actions (workflow run ${{ github.run_id }}). Same asset names as electron-builder; tag ends with _forge."
           release_url="https://github.com/${{ github.repository }}/releases/tag/$rid"
           echo "release_url=$release_url" >> "$GITHUB_OUTPUT"
 
@@ -230,7 +221,23 @@ jobs:
           export ASSET_URL="$asset_url"
           payload="$(python3 -c "import json, os; print(json.dumps({'release_id': os.environ['RELEASE_ID'], 'published_at': os.environ['PUBLISHED_AT'], 'platform': 'windows', 'assets': [{'name': os.environ['EXE_NAME'], 'url': os.environ['ASSET_URL']}], 'github_release_url': os.environ['RELEASE_URL']}))")"
           if [[ -n "${WEBHOOK_TOKEN:-}" ]]; then
-            curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer ${WEBHOOK_TOKEN}" -d "$payload" "$webhook_url"
+            curl --fail --show-error --silent \
+              -X POST "$webhook_url" \
+              -H "Content-Type: application/json" \
+              -H "x-release-token: $WEBHOOK_TOKEN" \
+              --data "$payload"
+          else
+            curl --fail --show-error --silent \
+              -X POST "$webhook_url" \
+              -H "Content-Type: application/json" \
+              --data "$payload"
+          fi
+
+      - name: Summary
+        working-directory: ${{ github.workspace }}
+        run: |
+          if [[ "${{ steps.exists.outputs.exists }}" == "true" ]]; then
+            echo "Skipped: release already exists for ${{ steps.artifact.outputs.release_id }}."
           else
-            curl -X POST -H "Content-Type: application/json" -d "$payload" "$webhook_url"
+            echo "Published ${{ steps.artifact.outputs.release_id }} (${{ steps.artifact.outputs.exe_path }})"
           fi

.github/workflows/releases-from-folder.yml

@@ -1,5 +1,5 @@
 # Build Windows installer on CI (no .exe committed to git), publish GitHub Release, notify /api/releases.
-name: Windows release (CI build)
+name: .exe build
 
 on:
   workflow_dispatch:
@@ -47,30 +47,31 @@ jobs:
       - name: Build Windows installer
         run: npm run build:win
 
-      # cleanup.cjs writes installer + latest.yml + portable zip + zip-latest.yml under releases/<build_id>/.
-      # Then we stage them under releases/electron/<build_id>/ to keep release technologies separated.
+      # cleanup.cjs writes releases/builder/<build_id>/ (installer at root; zip + yml in dev/).
+      # Stage flat copies under releases/electron/<build_id>/ for GitHub upload.
       - name: Locate electron-builder artifacts and stage under releases/electron
         id: artifact
         run: |
           set -euo pipefail
           rid="${{ steps.meta.outputs.release_id }}"
-          src_dir="releases/$rid"
+          src_dir="releases/builder/$rid"
+          dev_dir="$src_dir/dev"
           stage_dir="releases/electron/$rid"
           mkdir -p "$stage_dir"
           exe="$(ls -1 "$src_dir"/HyperlinksSpaceAppInstaller_*.exe 2>/dev/null | head -n 1 || true)"
           if [[ -z "$exe" || ! -f "$exe" ]]; then
             echo "Expected timestamped installer in $src_dir (set RELEASE_BUILD_ID=$rid)."
-            find releases -maxdepth 5 -type f 2>/dev/null || true
+            find releases -maxdepth 6 -type f 2>/dev/null || true
             exit 1
           fi
-          zip="$(ls -1 "$src_dir"/HyperlinksSpaceApp_*.zip 2>/dev/null | head -n 1 || true)"
+          zip="$(ls -1 "$dev_dir"/HyperlinksSpaceApp_*.zip 2>/dev/null | head -n 1 || true)"
           if [[ -z "$zip" || ! -f "$zip" ]]; then
-            echo "Portable zip HyperlinksSpaceApp_<version>.zip is required for in-app updates (electron-builder zip target + cleanup)."
-            find "$src_dir" -maxdepth 1 -type f 2>/dev/null || true
+            echo "Portable zip HyperlinksSpaceApp_<version>.zip is required in $dev_dir (electron-builder zip target + cleanup)."
+            find "$dev_dir" -maxdepth 1 -type f 2>/dev/null || true
             exit 1
           fi
-          yml="$(dirname "$exe")/latest.yml"
-          zip_yml="$(dirname "$zip")/zip-latest.yml"
+          yml="$dev_dir/latest.yml"
+          zip_yml="$dev_dir/zip-latest.yml"
           if [[ ! -f "$yml" ]]; then
             echo "latest.yml missing next to installer — electron-updater needs it on the GitHub Release."
             exit 1

app/docs/build_and_install.md

@@ -5,14 +5,14 @@ This doc describes the Windows Electron build and install flow and how to speed
 Exe creating example:
 
 ```
-cd /d C:\1\1\1\1\1\HyperlinksSpaceBot\app
+cd /d C:\1\1\1\1\1\HyperlinksSpaceProgram\app
 npm run build:win:verbose
 ```
 
 Exe bash run example:
 
 ```
-powershell -NoProfile -Command "Start-Process -FilePath 'C:/1/1/1/1/1/HyperlinksSpaceBot/app/releases/build_03252026_1449/HyperlinksSpaceAppInstaller.exe'"
+powershell -NoProfile -Command "Start-Process -FilePath 'C:/1/1/1/1/1/HyperlinksSpaceBot/app/releases/builder/build_03252026_1449/HyperlinksSpaceAppInstaller_03252026_1449.exe'"
 ```
 
 ---
@@ -25,9 +25,9 @@ powershell -NoProfile -Command "Start-Process -FilePath 'C:/1/1/1/1/1/Hyperlinks
 
 1. **Expo web export** – `npm run build` → `expo export -p web`. Metro bundles the app and writes static files to `dist/`. Usually the slowest step (tens of seconds).
 2. **Electron pack** – `electron-builder --win`. Rebuilds native deps (if any), packages the app, builds the NSIS installer. Downloads (Electron, NSIS, winCodeSign) are cached after first run.
-3. **Clean** – `node windows/cleanup.cjs`. Moves artifacts into `releases/build_MMDDYYYY_HHMM/` (installer at root, optional files in `dev/`).
+3. **Clean** – `node windows/cleanup.cjs`. Moves artifacts into `releases/builder/build_MMDDYYYY_HHMM/` (installer only at root; zip, yml, unpacked, and other artifacts under `dev/`).
 
-**Output:** `releases/build_<date>_<time>/HyperlinksSpaceAppInstaller.exe` and optionally `dev/` (win-unpacked, blockmap, builder-debug.yml, builder-effective-config.yaml).
+**Output:** `releases/builder/build_<date>_<time>/HyperlinksSpaceAppInstaller_<stamp>.exe` at root and `dev/` (portable zip, latest.yml, zip-latest.yml, win-unpacked, blockmap, builder-debug.yml, builder-effective-config.yaml).
 
 ### How to make the build faster
 
@@ -72,7 +72,7 @@ User runs **`HyperlinksSpaceAppInstaller.exe`**. NSIS extracts the app (e.g. to
 | **Auto-updates** | Add `electron-updater` (or similar) and serve updates over HTTPS so users get patches without reinstalling. |
 | **CI/CD** | In CI, cache `node_modules`, `.expo`, Metro cache, and `electron-builder` cache to make repeated builds much faster. |
 | **Developer Mode (Windows)** | If you build on Windows and use exe editing (icon, etc.), Developer Mode avoids symlink errors during the winCodeSign step. |
-| **Structured releases** | `windows/cleanup.cjs` puts each build in `releases/build_<date>_<time>/` with the installer at root and optional artifacts in `dev/`. |
+| **Structured releases** | `windows/cleanup.cjs` puts each build in `releases/builder/build_<date>_<time>/` with the installer at root and all other artifacts in `dev/`. |
 
 ---
 
@@ -89,7 +89,7 @@ User runs **`HyperlinksSpaceAppInstaller.exe`**. NSIS extracts the app (e.g. to
 
 ## 5. File layout after build
 
-- **After `build:win` or `pack:win`:** `app/releases/build_MMDDYYYY_HHMM/HyperlinksSpaceAppInstaller.exe` and `app/releases/build_MMDDYYYY_HHMM/dev/` (win-unpacked, blockmap, builder-debug.yml, builder-effective-config.yaml).
+- **After `build:win` or `pack:win`:** `app/releases/builder/build_MMDDYYYY_HHMM/HyperlinksSpaceAppInstaller_<stamp>.exe` and `app/releases/builder/build_MMDDYYYY_HHMM/dev/` (portable zip, yml, win-unpacked, blockmap, builder-debug.yml, builder-effective-config.yaml).
 - **After `build:win:dir`:** `app/release/win-unpacked/` (run `app.exe` from there).
 - **Build inputs:** `dist/` (Expo export), `windows/` (build.cjs, app-shell.html, preload-log.cjs), `assets/icon.ico`, and files listed under `build.files` in `package.json`.
 

app/docs/releases.md

@@ -12,7 +12,7 @@ This document defines the production plan for release detection, deduped GitHub
 ## Source of Truth
 
 - The **GitHub Release tag** is the release identity (`release_id`), for example `build_03252026_1929`.
-- Locally, `windows/cleanup.cjs` moves the built installer to `app/releases/build_MMDDYYYY_HHMM/HyperlinksSpaceAppInstaller.exe`. In CI you can set `RELEASE_BUILD_ID` to match a chosen tag, or leave it unset so the folder name comes from build time.
+- Locally, `windows/cleanup.cjs` moves the built installer to `app/releases/builder/build_MMDDYYYY_HHMM/HyperlinksSpaceAppInstaller_<stamp>.exe` (other artifacts under `dev/`). In CI you can set `RELEASE_BUILD_ID` to match a chosen tag, or leave it unset so the folder name comes from build time.
 
 ## Workflow Trigger
 
@@ -34,7 +34,7 @@ on:
 ## Dedupe Rules (No Duplicate Releases)
 
 1. Run `npm run build:win` (or use optional `RELEASE_BUILD_ID` so the output folder matches the intended tag).
-2. Resolve `release_id` from the optional input or from `releases/build_*/HyperlinksSpaceAppInstaller.exe`.
+2. Resolve `release_id` from the optional input or from `releases/builder/build_*/HyperlinksSpaceAppInstaller_*.exe`.
 3. Check whether GitHub Release/tag already exists for that `release_id`.
 4. If it exists:
    - Exit successfully (`0`)
@@ -193,7 +193,7 @@ Client behavior:
 
 ## Acceptance Criteria
 
-- A new `app/releases/build_.../` folder produces exactly one GitHub Release.
+- A new `app/releases/builder/build_.../` folder produces exactly one GitHub Release.
 - Re-running workflow for the same `release_id` does not create duplicates.
 - Webhook is called only for newly created releases.
 - `POST /api/releases` rejects unauthorized requests.