UI focus + docs polish (1.3.0)

Author: BF6 Portal Developer

.gitignore

@@ -26,7 +26,7 @@ Thumbs.db
 
 # Project Specific
 .env
-=Resources=/
+=Resources=/*
 
 # Keep external source metadata in git (but not cached downloads)
 !=Resources=/external_sources/
@@ -36,9 +36,15 @@ Thumbs.db
 !=Resources=/Portal Blocks/
 !=Resources=/Portal Blocks/*.json
 
+# Local scratch workspace (do not commit)
+=Resources=/Portal Blocks/custom_draft_workspace.json
+
 # Vendored third-party plugins (explicit allowlist)
 !=Resources=/ThirdParty/
 !=Resources=/ThirdParty/**
 
 # Local overrides (do not commit)
-web_ui/quotes.local.json
+web_ui/quotes.local.json
+
+# Local vendor tools (do not commit)
+tools/sysinternals/

=Resources=/Portal Blocks/custom_breakthrough_V1.1.json

@@ -4,17 +4,15 @@ This project follows a pragmatic changelog style (human-written notes) rather th
 
 ## Unreleased
 
-> Target release: **v1.3.0** (first official release). We’re still finishing/polishing this version.
-
-- **UI/UX:** eliminate the persistent toolbox/flyout vertical scrollbar artifact by hiding scrollbar chrome on Blockly’s inner scroll containers (not just the outer toolbox div).
-- **Window default:** app now opens maximized with a 1920×1080 (1080p) target size (clamped to the display work area) so the editor fills the screen by default.
+- (nothing yet)
 
 ## v1.3.0
 
 ### Features & Improvements (v1.3.0)
 
 - **Header/layout cleanup:** brand/logo aligned left, toolbox search moved into the header, and the app version is shown top-right.
 - **Workspace controls in header:** zoom in/out/reset/fit + trash moved to the top-right header to keep the canvas clear.
+- **Default focus point on load:** after loading presets/files, the viewport lands at the **top of the MOD block** (start of the rules chain).
 - **UI clutter removed:** removed the unused Live Diagnostics overlay and the floating Code Preview button (Code Preview is now a normal header button).
 - **Collections UX:** COLLECTIONS toolbox category now dynamically lists existing collections and includes a “Convert selection to collection” action.
 - **Collections visuals:** collection call/definition blocks are taller (easier to spot in large workspaces).
@@ -27,6 +25,9 @@ This project follows a pragmatic changelog style (human-written notes) rather th
 - **Selection Lists dropdowns:** address cases where dropdowns get stuck on “(loading selection lists…)” by improving runtime asset loading for Electron `file://` contexts.
 - **Presets:** allow saving after loading and editing a built-in preset (save-as copy / overwrite flow).
 
+- **Performance polish:** reduced redundant toolbox refresh work after programmatic loads.
+- **Console noise reduction:** reduced noisy informational logs during preset loads (opt-in debug via `localStorage.bf6_debug = "1"`).
+
 - **Presets (Electron file://):** built-in preset loading now falls back to reading JSON from disk when `fetch()` is unavailable/restricted in packaged builds.
 
 - **Electron compatibility:** removed remaining native `prompt()` usage by routing prompts through Blockly dialogs (Electron does not support `window.prompt`).

=Resources=/Portal Blocks/custom_conquest_template_V8.0.json

@@ -10,19 +10,27 @@ Changelog: see `CHANGELOG.md`.
 
 ## Screenshot
 
-![BF6Portal Tool editor screenshot](docs/screenshots/editor.png)
-
-> Note: The repo currently includes a tiny placeholder image. Replace `docs/screenshots/editor.png` with a real screenshot any time.
-
-## Features
-
-- **Rules toolbox essentials:** a single **RULES** menu containing `MOD_BLOCK`, `RULE_HEADER`, and `CONDITION_BLOCK`.
-- **Import compatibility:** loads Blockly JSON exports, including common community/template wrappers like `{ "mod": { ... } }`.
-- **Resilient template loading:** missing block `type`s are auto-registered as **placeholder blocks** so templates can still render.
-- **Presets:** 3 locked built-ins (Andy6170 templates) + user save/delete via `localStorage`.
-- **Help modal + right-click help:** offline docs from `bf6portal_blocks.json` and per-block “Help: `<type>`”.
-- **Code Preview drawer:** resizable bottom drawer showing a TypeScript export of the current workspace state.
-- **TypeScript import:** **coming soon** (UI shows the button, but the feature is intentionally disabled until correctness can be guaranteed).
+![BF6Portal Tool UI overview](docs/screenshots/UI-overview.png)
+
+## What the UI provides
+
+- **Workspace editor (Blockly):** build rule logic visually.
+- **Toolbox search (header):** quickly filter blocks by name.
+- **Workspace controls (header):** zoom in/out, reset zoom, zoom-to-fit, and trash/delete selected block.
+- **Presets (header dropdown):**
+    - 3 built-in presets (locked)
+    - save your own presets, overwrite safely, delete user presets
+- **Import / Export:**
+    - load `.json` (Blockly workspace JSON) and legacy `.xml`
+    - export Portal JSON (best-effort compatibility wrapper)
+    - TypeScript snapshot export + TypeScript import (round-trip the workspace state)
+- **Variables:** a dedicated VARIABLES toolbox category with:
+    - “New / Manage Variables”
+    - pre-filled GET/SET templates for existing variables
+- **Collections / Bookmarks:** convert a selected stack into an offscreen definition and keep a compact call/bookmark block.
+- **Navigation (“teleport”):** right-click jump helpers (MOD / owning rule / stack root / variables / subroutine call ⇄ definition).
+- **Help:** Help modal + right-click per-block help using the local `bf6portal_blocks.json` docs.
+- **Code Preview drawer:** resizable bottom drawer that shows a TypeScript representation of the current workspace state.
 
 ## Installation & setup
 

=Resources=/Portal Blocks/custom_rush_V1.0.json

@@ -1,68 +1,10 @@
-# TODO
+# TODO (user-facing)
 
-- [x] **Docs:** keep `CHANGELOG.md` and `docs/RELEASE_NOTES_*.md` aligned with the current shipped app version.
-- [x] **Docs:** update `README.md` version badge + release notes link.
+This file is intended to be *your* current task list.
 
-- [x] **UI/UX:** Fix persistent vertical scrollbar appearing next to the toolbox flyout after interacting with menus.
-    - **Location:** Left side of the screen, adjacent to the Blockly toolbox category list.
-    - **Fix:** Hide scrollbar chrome on the actual inner scroll containers Blockly uses in this build (e.g. `.blocklyToolboxContents`, `.blocklyToolboxContentsWrapper`, `.blocklyTreeRoot`) plus a defensive `::-webkit-scrollbar` rule for nested elements.
-    - **Notes:** This keeps scrolling functional but removes the persistent native scrollbar artifact under Electron/Chromium.
+## Pending
 
-## Completed (v1.3.0)
-
-- [x] **Toolbox search:** restore the search box above the toolbox (above **RULES**) and keep it working in packaged Electron builds.
-
-- [x] **Custom variables imports:** ensure variables from Andy6170 presets (and other imported JSON) are visible in the **VARIABLES** toolbox category and variable dropdowns.
-
-- [x] **Right-click Help:** right-clicking a block should open the local Help topic (not “no help info yet” when we have docs).
-
-- [x] **Help search stability:** typing into Help search should not scramble text (e.g. `MOD` accidentally becoming `DOM` due to caret reset).
-
-- [x] **Selection list colours:** selection-list dropdown blocks (e.g. **Vehicles**) should use a consistent colour (no random red outlier).
-
-- [x] **Portal JSON compatibility:** exported/imported workspace JSON matches Portal-style wrapper (`{"mod":{"blocks":...}}`), and importer accepts both wrapped and raw Blockly workspace formats.
-
-- [x] **TypeScript import (placeholder):** show an **Import TS (Coming soon)** button until we can guarantee correctness of a full TypeScript → Blocks import flow.
-
-- [x] **Navigation / Teleport (right-click):** jump helpers to quickly move around the canvas.
-    - [x] Subroutines: Call ↔ Definition
-    - [x] MOD: jump to MOD container
-    - [x] Rules: jump to owning Rule / first Rule
-    - [x] Variables: jump between first getter/setter
-    - [x] Generic: jump to stack root
-
-## Next (post v1.3.0)
-
-- [ ] **Collections / Snippets (macro library):** let users save a selection of blocks as a reusable “collection” and insert/execute it later.
-    - UX idea: right-click selection / block → **Save as Collection…**, then a toolbox menu **Collections**.
-    - Safety: prevent naming collisions with existing block types + reserved names.
-    - Visual: distinct styling (e.g. bright green outline / unique shape) so collections stand out.
-    - [x] MVP (bookmark-style): new **COLLECT** call block + offscreen **COLLECTION** definition block.
-    - [x] Right-click: **Convert to collection (bookmark + move stack)** and **Jump to collection definition**.
-    - [x] Codegen: call block inlines the definition stack (recursion guarded).
-    - [x] Next: toolbox **COLLECTIONS** flyout dynamically lists existing collections.
-    - [x] Next: make the call block itself use a dropdown of existing collections (avoid typos), while still allowing manual entry when importing older workspaces.
-    - [x] Next: optional “Export for Portal” flow that expands collections and strips tool-only blocks.
-
-- [ ] **External reference:** review `deluca-mike/bf6-portal-scripting-template` for ideas (TS bundling, debug UI patterns). Permission has been confirmed; still respect any upstream license/restrictions and keep attribution up to date.
-
-- [ ] **Project cleanup / stabilization (v1.3.0 goal):**
-    - remove unnecessary comments, dead code paths, and stale file references
-    - consolidate duplicate logic (especially toolbox/presets/selection-lists)
-    - ensure naming and folder layout is consistent
-    - add or update documentation for the final structure
-
-- [ ] **Toolbox parity + ordering:** user-provided lists will define the exact order and membership of blocks in each menu; implement parity checks so we can confirm “everything is present” and in the right spot.
-
-- [ ] **Variables UX:** decide and implement whether “custom variables” should be listed (and where). Ensure variable creation + listing + toolbox generation are consistent across:
-    - fresh workspaces
-    - imported community templates
-    - built-in presets
-
-- [ ] **Selection Lists:** continue hardening edge cases where dropdowns can get stuck on “(loading selection lists…)” under Electron `file://`.
-
-- [ ] **Presets:** richer preset UX (save-as copy / overwrite flow for built-ins, better naming + metadata).
-
-- [ ] **Build outputs:** reduce `dist-*` folder sprawl and add a safe cleanup flow (Windows file locks on `app.asar` are common).
-
-- [ ] **Testing:** keep the headless preset-load smoke test and consider running it in CI for regressions.
+- [ ] **Official Portal integration (main goal):** exported workspaces/presets must import correctly into the *official* BF Portal Rules Editor.
+    - exported JSON should load and display the same workspace (not the default empty Mod + Rule)
+    - presets exported from this tool should import identically to known-good official presets
+    - verify file format/schema, encoding, and any required metadata

CHANGELOG.md

@@ -2998,7 +2998,7 @@
         "colour": "#6E47A0",
         "tooltip": "",
         "message": "RULE Name: %1 Event %2 %3\nConditions: %4\nActions: %5",
-        "args_json": "[{\"type\": \"field_input\", \"name\": \"RULE_NAME\", \"text\": \"New Rule\"}, {\"type\": \"field_dropdown\", \"name\": \"EVENT_TYPE\", \"options\": [[\"Ongoing\", \"ONGOING\"], [\"OnAIMoveToFailed\", \"ON_AI_MOVE_TO_FAILED\"], [\"OnAIMoveToRunning\", \"ON_AI_AI_MOVE_TO_RUNNING\"]]}, {\"type\": \"field_dropdown\", \"name\": \"SCOPE_TYPE\", \"options\": [[\"Global\", \"GLOBAL\"], [\"AreaTrigger\", \"AREA_TRIGGER\"], [\"CapturePoint\", \"CAPTURE_POINT\"], [\"EmplacementSpawner\", \"EMPLACEMENT_SPAWNER\"]]}, {\"type\": \"input_value\", \"name\": \"CONDITIONS\", \"check\": \"Boolean\"}, {\"type\": \"input_statement\", \"name\": \"ACTIONS\", \"check\": [\"Action\", \"SubroutineReference\", \"ControlAction\"]}]",
+        "args_json": "[{\"type\": \"field_input\", \"name\": \"RULE_NAME\", \"text\": \"New Rule\"}, {\"type\": \"field_dropdown\", \"name\": \"EVENT_TYPE\", \"options\": [[\"Ongoing\", \"ONGOING\"], [\"OnAIMoveToFailed\", \"ON_AI_MOVE_TO_FAILED\"], [\"OnAIMoveToRunning\", \"ON_AI_MOVE_TO_RUNNING\"], [\"OnAIMoveToSucceeded\", \"ON_AI_MOVE_TO_SUCCEEDED\"], [\"OnAIParachuteRunning\", \"ON_AI_PARACHUTE_RUNNING\"], [\"OnAIParachuteSucceeded\", \"ON_AI_PARACHUTE_SUCCEEDED\"], [\"OnAIWaypointIdleFailed\", \"ON_AI_WAYPOINT_IDLE_FAILED\"], [\"OnAIWaypointIdleRunning\", \"ON_AI_WAYPOINT_IDLE_RUNNING\"], [\"OnAIWaypointIdleSucceeded\", \"ON_AI_WAYPOINT_IDLE_SUCCEEDED\"], [\"OnCapturePointCaptured\", \"ON_CAPTURE_POINT_CAPTURED\"], [\"OnCapturePointCapturing\", \"ON_CAPTURE_POINT_CAPTURING\"], [\"OnCapturePointLost\", \"ON_CAPTURE_POINT_LOST\"], [\"OnGameModeEnding\", \"ON_GAME_MODE_ENDING\"], [\"OnGameModeStarted\", \"ON_GAME_MODE_STARTED\"], [\"OnMandown\", \"ON_MANDOWN\"], [\"OnMCOMArmed\", \"ON_MCOM_ARMED\"], [\"OnMCOMDefused\", \"ON_MCOM_DEFUSED\"], [\"OnMCOMDestroyed\", \"ON_MCOM_DESTROYED\"], [\"OnPlayerDamaged\", \"ON_PLAYER_DAMAGED\"], [\"OnPlayerDeployed\", \"ON_PLAYER_DEPLOYED\"], [\"OnPlayerDied\", \"ON_PLAYER_DIED\"], [\"OnPlayerEarnedKill\", \"ON_PLAYER_EARNED_KILL\"], [\"OnPlayerEarnedKillAssist\", \"ON_PLAYER_EARNED_KILL_ASSIST\"], [\"OnPlayerEnterAreaTrigger\", \"ON_PLAYER_ENTER_AREA_TRIGGER\"], [\"OnPlayerEnterCapturePoint\", \"ON_PLAYER_ENTER_CAPTURE_POINT\"], [\"OnPlayerEnterVehicle\", \"ON_PLAYER_ENTER_VEHICLE\"], [\"OnPlayerEnterVehicleSeat\", \"ON_PLAYER_ENTER_VEHICLE_SEAT\"], [\"OnPlayerExitAreaTrigger\", \"ON_PLAYER_EXIT_AREA_TRIGGER\"], [\"OnPlayerExitCapturePoint\", \"ON_PLAYER_EXIT_CAPTURE_POINT\"], [\"OnPlayerExitVehicle\", \"ON_PLAYER_EXIT_VEHICLE\"], [\"OnPlayerExitVehicleSeat\", \"ON_PLAYER_EXIT_VEHICLE_SEAT\"], [\"OnPlayerInteract\", \"ON_PLAYER_INTERACT\"], [\"OnPlayerJoinGame\", \"ON_PLAYER_JOIN_GAME\"], [\"OnPlayerLeaveGame\", \"ON_PLAYER_LEAVE_GAME\"], [\"OnPlayerSwitchTeam\", \"ON_PLAYER_SWITCH_TEAM\"], [\"OnPlayerUIButtonEvent\", \"ON_PLAYER_UI_BUTTON_EVENT\"], [\"OnPlayerUndeploy\", \"ON_PLAYER_UNDEPLOY\"], [\"OnRayCastHit\", \"ON_RAY_CAST_HIT\"], [\"OnRayCastMissed\", \"ON_RAY_CAST_MISSED\"], [\"OnRevived\", \"ON_REVIVED\"], [\"OnRingOfFireZoneSizeChange\", \"ON_RING_OF_FIRE_ZONE_SIZE_CHANGE\"], [\"OnSpawnerSpawned\", \"ON_SPAWNER_SPAWNED\"], [\"OnTimeLimitReached\", \"ON_TIME_LIMIT_REACHED\"], [\"OnVehicleDestroyed\", \"ON_VEHICLE_DESTROYED\"], [\"OnVehicleSpawned\", \"ON_VEHICLE_SPAWNED\"]]}, {\"type\": \"field_dropdown\", \"name\": \"SCOPE_TYPE\", \"options\": [[\"Global\", \"GLOBAL\"], [\"AreaTrigger\", \"AREA_TRIGGER\"], [\"CapturePoint\", \"CAPTURE_POINT\"], [\"EmplacementSpawner\", \"EMPLACEMENT_SPAWNER\"], [\"HQ\", \"HQ\"], [\"InteractPoint\", \"INTERACT_POINT\"], [\"LootSpawner\", \"LOOT_SPAWNER\"], [\"MCOM\", \"MCOM\"], [\"Player\", \"PLAYER\"], [\"RingOfFire\", \"RING_OF_FIRE\"], [\"ScreenEffect (deprecated)\", \"SCREEN_EFFECT\"], [\"Sector\", \"SECTOR\"], [\"SFX\", \"SFX\"], [\"SpatialObject\", \"SPATIAL_OBJECT\"], [\"Spawner\", \"SPAWNER\"], [\"SpawnPoint\", \"SPAWN_POINT\"], [\"Team\", \"TEAM\"], [\"Vehicle\", \"VEHICLE\"], [\"VehicleSpawner\", \"VEHICLE_SPAWNER\"], [\"VFX\", \"VFX\"], [\"VO\", \"VO\"], [\"WaypointPath\", \"WAYPOINT_PATH\"], [\"WorldIcon\", \"WORLD_ICON\"]]}, {\"type\": \"input_value\", \"name\": \"CONDITIONS\", \"check\": \"Boolean\"}, {\"type\": \"input_statement\", \"name\": \"ACTIONS\", \"check\": [\"Action\", \"SubroutineReference\", \"ControlAction\"]}]",
         "output_type": null,
         "connections": "Statement"
     },

README.md

@@ -17,6 +17,7 @@
 - Workspace controls moved to the header (top-right): zoom in/out/reset/fit + trash (Blockly’s on-canvas zoom/trash UI is disabled/hidden).
 - **Default window size / fullscreen feel:** the app now opens maximized with a 1920×1080 (1080p) target size (clamped to your display work area) so it fills the screen on standard 1080p desktops.
 - Fixed the persistent toolbox/flyout vertical scrollbar artifact by hiding native scrollbar chrome on Blockly’s inner scroll containers.
+- **Default focus point on load:** when you load a preset or import a workspace, the view now lands at the **top of the MOD block** (start of the rules chain) so you don’t have to scroll around to find the beginning.
 
 ### Collections
 
@@ -43,6 +44,8 @@
 - Placeholder block auto-registration prevents missing block types from breaking loads.
 - Ensured critical Portal structural blocks (like `modBlock` with `RULES`) exist before loading templates.
 - Built-in presets load reliably in packaged Electron builds under `file://` by falling back to disk reads when `fetch()` is unavailable.
+- **Performance polish:** reduced redundant toolbox refresh work after programmatic loads.
+- **Console noise reduction:** noisy informational logs during preset loads are now gated behind an opt-in debug flag (`localStorage.bf6_debug = "1"`).
 
 ## Notes