Merge branch 'Dev' into GUI-and-Configs

Documentation/01_User_Guide/04_Configuration_and_Presets.md

@@ -15,7 +15,7 @@ The `app_settings.json` file is structured into several key sections, including:
 
 ### LLM Predictor Settings
 
-For users who wish to utilize the experimental LLM Predictor feature, the following settings are available in `config/app_settings.json`:
+For users who wish to utilize the experimental LLM Predictor feature, the following settings are available in `config/llm_settings.json`:
 
 *   `llm_endpoint_url`: The URL of the LLM API endpoint. For local LLMs like LM Studio or Ollama, this will typically be `http://localhost:<port>/v1`. Consult your LLM server documentation for the exact endpoint.
 *   `llm_api_key`: The API key required to access the LLM endpoint. Some local LLM servers may not require a key, in which case this can be left empty.
@@ -23,15 +23,39 @@ For users who wish to utilize the experimental LLM Predictor feature, the follow
 *   `llm_temperature`: Controls the randomness of the LLM's output. Lower values (e.g., 0.1-0.5) make the output more deterministic and focused, while higher values (e.g., 0.6-1.0) make it more creative and varied. For prediction tasks, lower temperatures are generally recommended.
 *   `llm_request_timeout`: The maximum time (in seconds) to wait for a response from the LLM API. Adjust this based on the performance of your LLM server and the complexity of the requests.
 
-Note that the `llm_predictor_prompt` and `llm_predictor_examples` settings are also present in `app_settings.json`. These define the instructions and examples provided to the LLM for prediction. While they can be viewed here, they are primarily intended for developer reference and tuning the LLM's behavior, and most users will not need to modify them.
+Note that the `llm_predictor_prompt` and `llm_predictor_examples` settings are also present in `config/llm_settings.json`. These define the instructions and examples provided to the LLM for prediction. While they can be viewed here, they are primarily intended for developer reference and tuning the LLM's behavior, and most users will not need to modify them directly via the file. These settings are editable via the LLM Editor panel in the main GUI when the LLM interpretation mode is selected.
 
-## GUI Configuration Editor
+## Application Preferences (`config/app_settings.json` overrides)
 
-You can modify the `app_settings.json` file using the built-in GUI editor. Access it via the **Edit** -> **Preferences...** menu.
+You can modify user-overridable application settings using the built-in GUI editor. These settings are loaded from `config/app_settings.json` and saved as overrides in `config/user_settings.json`. Access it via the **Edit** -> **Preferences...** menu.
 
-This editor provides a tabbed interface (e.g., "General", "Output & Naming") to view and change the core application settings defined in `app_settings.json`. Settings in the editor directly correspond to the structure and values within the JSON file. Note that any changes made through the GUI editor require an application restart to take effect.
+This editor provides a tabbed interface to view and change various application behaviors. The tabs include:
+*   **General:** Basic settings like output base directory and temporary file prefix.
+*   **Output & Naming:** Settings controlling output directory and filename patterns, and how variants are handled.
+*   **Image Processing:** Settings related to image resolution definitions, compression levels, and format choices.
+*   **Map Merging:** Configuration for how multiple input maps are combined into single output maps.
+*   **Postprocess Scripts:** Paths to default Blender files for post-processing.
 
-*(Ideally, a screenshot of the GUI Configuration Editor would be included here.)*
+Note that this editor focuses on user-specific overrides of core application settings. **Asset Type Definitions, File Type Definitions, and Supplier Settings are managed in a separate Definitions Editor.**
+
+Any changes made through the Preferences editor require an application restart to take effect.
+
+*(Ideally, a screenshot of the Application Preferences editor would be included here.)*
+
+## Definitions Editor (`config/asset_type_definitions.json`, `config/file_type_definitions.json`, `config/suppliers.json`)
+
+Core application definitions that are separate from general user preferences are managed in the dedicated Definitions Editor. This includes defining known asset types, file types, and configuring settings specific to different suppliers. Access it via the **Edit** -> **Edit Definitions...** menu.
+
+The editor is organized into three tabs:
+*   **Asset Type Definitions:** Define the different categories of assets (e.g., Surface, Model, Decal). For each asset type, you can configure its description, a color for UI representation, and example usage strings.
+*   **File Type Definitions:** Define the specific types of files the tool recognizes (e.g., MAP_COL, MAP_NRM, MODEL). For each file type, you can configure its description, a color, example keywords/patterns, a standard type alias, bit depth handling rules, whether it's grayscale, and an optional keybind for quick assignment in the GUI.
+*   **Supplier Settings:** Configure settings that are specific to assets originating from different suppliers. Currently, this includes the "Normal Map Type" (OpenGL or DirectX) used for normal maps from that supplier.
+
+Each tab presents a list of the defined items on the left (Asset Types, File Types, or Suppliers). Selecting an item in the list displays its configurable details on the right. Buttons are provided to add new definitions or remove existing ones.
+
+Changes made in the Definitions Editor are saved directly to their respective configuration files (`config/asset_type_definitions.json`, `config/file_type_definitions.json`, and `config/suppliers.json`). Some changes may require an application restart to take full effect in processing logic.
+
+*(Ideally, screenshots of the Definitions Editor tabs would be included here.)*
 
 ## Preset Files (`presets/*.json`)
 

Documentation/01_User_Guide/05_Usage_GUI.md

@@ -12,7 +12,10 @@ python -m gui.main_window
 
 ## Interface Overview
 
-*   **Menu Bar:** The "Edit" menu contains the "Preferences..." option to open the GUI Configuration Editor. The "View" menu allows you to toggle the visibility of the Log Console and the Detailed File Preview.
+*   **Menu Bar:** The "Edit" menu contains options to configure application settings and definitions:
+    *   **Preferences...:** Opens the Application Preferences editor for user-overridable settings (saved to `config/user_settings.json`).
+    *   **Edit Definitions...:** Opens the Definitions Editor for managing Asset Type Definitions, File Type Definitions, and Supplier Settings (saved to their respective files).
+The "View" menu allows you to toggle the visibility of the Log Console and the Detailed File Preview.
 *   **Preset Editor Panel (Left):**
     *   **Optional Log Console:** Displays application logs (toggle via View menu).
     *   **Preset List:** Create, delete, load, edit, and save presets. On startup, the "-- Select a Preset --" item is explicitly selected. You must select a specific preset from this list to load it into the editor below, enable the detailed file preview, and enable the "Start Processing" button.

Documentation/01_User_Guide/09_Output_Structure.md

@@ -2,7 +2,7 @@
 
 This document describes the directory structure and contents of the processed assets generated by the Asset Processor Tool.
 
-Processed assets are saved to a location determined by two global settings defined in `config/app_settings.json`:
+Processed assets are saved to a location determined by two global settings, `OUTPUT_DIRECTORY_PATTERN` and `OUTPUT_FILENAME_PATTERN`, defined in `config/app_settings.json`. These settings can be overridden by the user via `config/user_settings.json`.
 
 *   `OUTPUT_DIRECTORY_PATTERN`: Defines the directory structure *within* the Base Output Directory.
 *   `OUTPUT_FILENAME_PATTERN`: Defines the naming convention for individual files *within* the directory created by `OUTPUT_DIRECTORY_PATTERN`.
@@ -23,7 +23,7 @@ The following tokens can be used in both `OUTPUT_DIRECTORY_PATTERN` and `OUTPUT_
 *   `[Time]`: Current time (`HHMMSS`).
 *   `[Sha5]`: The first 5 characters of the SHA-256 hash of the original input source file (e.g., the source zip archive).
 *   `[ApplicationPath]`: Absolute path to the application directory.
-*   `[maptype]`: The standardized map type identifier (e.g., `COL` for Color/Albedo, `NRM` for Normal, `RGH` for Roughness). This is derived from the `standard_type` defined in the application's `FILE_TYPE_DEFINITIONS` (see `config/app_settings.json`) and may include a variant suffix if applicable. (Primarily for filename pattern)
+*   `[maptype]`: The standardized map type identifier (e.g., `COL` for Color/Albedo, `NRM` for Normal, `RGH` for Roughness). This is derived from the `standard_type` defined in the application's `FILE_TYPE_DEFINITIONS` (managed in `config/file_type_definitions.json` via the Definitions Editor) and may include a variant suffix if applicable. (Primarily for filename pattern)
 *   `[dimensions]`: Pixel dimensions (e.g., `2048x2048`).
 *   `[bitdepth]`: Output bit depth (e.g., `8bit`, `16bit`).
 *   `[category]`: Asset category determined by preset rules.
@@ -51,7 +51,7 @@ The final output path is constructed by combining the Base Output Directory (set
 *   `OUTPUT_FILENAME_PATTERN`: `[maptype].[ext]`
 *   Resulting Path for a Normal map: `Output/Texture/Wood/WoodFloor001/Normal.exr`
 
-The `<output_base_directory>` (the root folder where processing output starts) is configured separately via the GUI (**Edit** -> **Preferences...** -> **Output & Naming** tab -> **Base Output Directory**) or the `--output` CLI argument. The `OUTPUT_DIRECTORY_PATTERN` defines the structure *within* this base directory, and `OUTPUT_FILENAME_PATTERN` defines the filenames within that structure.
+The `<output_base_directory>` (the root folder where processing output starts) is configured separately via the GUI (**Edit** -> **Preferences...** -> **General** tab -> **Output Base Directory**) or the `--output` CLI argument. The `OUTPUT_DIRECTORY_PATTERN` defines the structure *within* this base directory, and `OUTPUT_FILENAME_PATTERN` defines the filenames within that structure.
 
 ## Contents of Each Asset Directory
 

Documentation/02_Developer_Guide/04_Configuration_System_and_Presets.md

@@ -2,43 +2,141 @@
 
 This document provides technical details about the configuration system and the structure of preset files for developers working on the Asset Processor Tool.
 
-## Configuration Flow
+## Configuration System Overview
 
-The tool utilizes a two-tiered configuration system managed by the `configuration.py` module:
+The tool's configuration is managed by the `configuration.py` module and loaded from several JSON files, providing a layered approach for defaults, user overrides, definitions, and source-specific presets.
 
-1.  **Application Settings (`config/app_settings.json`):** This JSON file defines the core global default settings, constants, and rules that apply generally across different asset sources (e.g., the global `OUTPUT_DIRECTORY_PATTERN` and `OUTPUT_FILENAME_PATTERN`, standard image resolutions, map merge rules, output format rules, Blender paths, `FILE_TYPE_DEFINITIONS`, `ASSET_TYPE_DEFINITIONS`). See the [User Guide: Output Structure](../01_User_Guide/09_Output_Structure.md#available-tokens) for a list of available tokens for these patterns.
-*   **`FILE_TYPE_DEFINITIONS` Enhancements:**
-        *   **`keybind` Property:** Each file type object within `FILE_TYPE_DEFINITIONS` can now optionally include a `keybind` property. This property accepts a single character string (e.g., `"C"`, `"R"`) representing the keyboard key. In the GUI, this key (typically combined with `Ctrl`, or standalone like `F2` for asset naming) is used as a shortcut to set or toggle the corresponding file type for selected items in the Preview Table.
+### Configuration Files
+
+The tool's configuration is loaded from several JSON files, providing a layered approach for defaults, user overrides, definitions, and source-specific presets.
+
+1.  **Application Settings (`config/app_settings.json`):** This JSON file defines the core global default settings, constants, and rules that apply generally across different asset sources (e.g., the global `OUTPUT_DIRECTORY_PATTERN` and `OUTPUT_FILENAME_PATTERN`, standard image resolutions, map merge rules, output format rules, Blender paths, temporary directory prefix, initial scaling mode, merge dimension mismatch strategy). See the [User Guide: Output Structure](../01_User_Guide/09_Output_Structure.md#available-tokens) for a list of available tokens for these patterns.
+    *   *Note:* `ASSET_TYPE_DEFINITIONS` and `FILE_TYPE_DEFINITIONS` are no longer stored here; they have been moved to dedicated files.
+
+2.  **User Settings (`config/user_settings.json`):** This optional JSON file allows users to override specific settings defined in `config/app_settings.json`. If this file exists, its values for corresponding keys will take precedence over the base application settings. This file is primarily managed through the GUI's Application Preferences Editor.
+
+3.  **Asset Type Definitions (`config/asset_type_definitions.json`):** This dedicated JSON file contains the definitions for different asset types (e.g., Surface, Model, Decal), including their descriptions, colors for UI representation, and example usage strings.
+
+4.  **File Type Definitions (`config/file_type_definitions.json`):** This dedicated JSON file contains the definitions for different file types (specifically texture maps and models), including descriptions, colors for UI representation, examples of keywords/patterns, a standard alias (`standard_type`), bit depth handling rules (`bit_depth_rule`), a grayscale flag (`is_grayscale`), and an optional GUI keybind (`keybind`).
+    *   **`keybind` Property:** Each file type object within `FILE_TYPE_DEFINITIONS` can optionally include a `keybind` property. This property accepts a single character string (e.g., `"C"`, `"R"`) representing the keyboard key. In the GUI, this key (typically combined with `Ctrl`) is used as a shortcut to set or toggle the corresponding file type for selected items in the Preview Table.
         *Example:*
         ```json
         "MAP_COL": {
             "description": "Color/Albedo Map",
-                "color": [200, 200, 200],
-                "examples": ["albedo", "col", "basecolor"],
+            "color": "#ffaa00",
+            "examples": ["_col.", "_basecolor.", "albedo", "diffuse"],
             "standard_type": "COL",
-                "bit_depth_rule": "respect",
+            "bit_depth_rule": "force_8bit",
             "is_grayscale": false,
             "keybind": "C"
         },
         ```
-        *   **New File Type `MAP_GLOSS`:** A new standard file type, `MAP_GLOSS`, has been added. It is typically configured as follows:
-            *Example:*
+        Note: The `bit_depth_rule` property in `FILE_TYPE_DEFINITIONS` is the primary source for determining bit depth handling for a given map type.
+
+5.  **Supplier Settings (`config/suppliers.json`):** This JSON file stores settings specific to different asset suppliers. It is now structured as a dictionary where keys are supplier names and values are objects containing supplier-specific configurations.
+    *   **Structure:**
         ```json
-            "MAP_GLOSS": {
-                "description": "Glossiness Map",
-                "color": [180, 180, 220],
-                "examples": ["gloss", "gls"],
-                "standard_type": "GLOSS",
-                "bit_depth_rule": "respect",
-                "is_grayscale": true,
-                "keybind": "R"
+        {
+          "SupplierName1": {
+            "setting_key1": "value",
+            "setting_key2": "value"
+          },
+          "SupplierName2": {
+            "setting_key1": "value"
+          }
+        }
+        ```
+    *   **`normal_map_type` Property:** A key setting within each supplier's object is `normal_map_type`, specifying whether normal maps from this supplier use "OpenGL" or "DirectX" conventions.
+        *Example:*
+        ```json
+        {
+          "Poliigon": {
+            "normal_map_type": "DirectX"
+          },
+          "Dimensiva": {
+            "normal_map_type": "OpenGL"
+          }
         }
         ```
-            Note: The `keybind` "R" for `MAP_GLOSS` is often shared with `MAP_ROUGH` to allow toggling between them.
-2.  **LLM Settings (`config/llm_settings.json`):** This JSON file contains settings specifically related to the LLM predictor, such as the API endpoint, model name, prompt template, and examples. These settings can be edited through the GUI using the `LLMEditorWidget`.
-3.  **Preset Files (`Presets/*.json`):** These JSON files define supplier-specific rules and overrides. They contain patterns to interpret filenames, classify map types, handle variants, define naming conventions, and specify other source-specific behaviors.
 
-The `configuration.py` module contains the `Configuration` class (for loading/merging settings for processing) and standalone functions like `load_base_config()` (for accessing `app_settings.json` directly) and `save_llm_config()` / `save_base_config()` (for writing settings back to files). Note that the old `config.py` file has been deleted.
+6.  **LLM Settings (`config/llm_settings.json`):** This JSON file contains settings specifically related to the LLM predictor, such as the API endpoint, model name, prompt template, and examples. These settings are managed through the GUI using the `LLMEditorWidget`.
+
+7.  **Preset Files (`Presets/*.json`):** These JSON files define source-specific rules and overrides. They contain patterns to interpret filenames, classify map types, handle variants, define naming conventions, and specify other source-specific behaviors. Preset settings override values from `app_settings.json` and `user_settings.json` where applicable.
+
+
+### Configuration Loading and Access
+
+The `configuration.py` module contains the `Configuration` class and standalone functions for loading and saving settings.
+
+*   **`Configuration` Class:** This is the primary class used by the processing engine and other core components. When initialized with a `preset_name`, it loads settings in the following order, with later files overriding earlier ones for shared keys:
+    1.  `config/app_settings.json` (Base Defaults)
+    2.  `config/user_settings.json` (User Overrides - if exists)
+    3.  `config/asset_type_definitions.json` (Asset Type Definitions)
+    4.  `config/file_type_definitions.json` (File Type Definitions)
+    5.  `config/llm_settings.json` (LLM Settings)
+    6.  `Presets/{preset_name}.json` (Preset Overrides)
+
+    The loaded settings are merged into internal dictionaries, and most are accessible via instance properties (e.g., `config.output_base_dir`, `config.llm_endpoint_url`, `config.get_asset_type_definitions()`). Regex patterns defined in the merged configuration are pre-compiled for performance.
+
+*   **`load_base_config()` function:** This standalone function is primarily used by the GUI for initial setup and displaying default/user-overridden settings before a specific preset is selected. It loads and merges the following files:
+    1.  `config/app_settings.json`
+    2.  `config/user_settings.json` (if exists)
+    3.  `config/asset_type_definitions.json`
+    4.  `config/file_type_definitions.json`
+
+    It returns a single dictionary containing the combined settings and definitions.
+
+*   **Saving Functions:**
+    *   `save_base_config(settings_dict)`: Saves the provided dictionary to `config/app_settings.json`. (Used less frequently now for user-driven saves).
+    *   `save_user_config(settings_dict)`: Saves the provided dictionary to `config/user_settings.json`. Used by `ConfigEditorDialog`.
+    *   `save_llm_config(settings_dict)`: Saves the provided dictionary to `config/llm_settings.json`. Used by `LLMEditorWidget`.
+
+## Supplier Management (`config/suppliers.json`)
+
+A file, `config/suppliers.json`, is used to store a persistent list of known supplier names. This file is a simple JSON array of strings.
+
+*   **Purpose:** Provides a list of suggestions for the "Supplier" field in the GUI's Unified View, enabling auto-completion.
+*   **Management:** The GUI's `SupplierSearchDelegate` is responsible for loading this list on startup, adding new, unique supplier names entered by the user, and saving the updated list back to the file.
+
+## GUI Configuration Editors
+
+The GUI provides dedicated editors for modifying configuration files:
+
+*   **`ConfigEditorDialog` (`gui/config_editor_dialog.py`):** Edits user-configurable application settings.
+*   **`LLMEditorWidget` (`gui/llm_editor_widget.py`):** Edits the LLM-specific settings.
+
+### `ConfigEditorDialog` (`gui/config_editor_dialog.py`)
+
+The GUI includes a dedicated editor for modifying user-configurable settings. This is implemented in `gui/config_editor_dialog.py`.
+
+*   **Purpose:** Provides a user-friendly interface for viewing the effective application settings (defaults + user overrides + definitions) and editing the user-specific overrides.
+*   **Implementation:** The dialog loads the effective settings using `load_base_config()`. It presents relevant settings in a tabbed layout ("General", "Output & Naming", etc.). When saving, it now performs a **granular save**: it loads the current content of `config/user_settings.json`, identifies only the settings that were changed by the user during the current dialog session (by comparing against the initial state), updates only those specific values in the loaded `user_settings.json` content, and saves the modified content back to `config/user_settings.json` using `save_user_config()`. This preserves any other settings in `user_settings.json` that were not touched. The dialog displays definitions from `asset_type_definitions.json` and `file_type_definitions.json` but does not save changes to these files.
+*   **Limitations:** Currently, editing complex fields like `IMAGE_RESOLUTIONS` or the full details of `MAP_MERGE_RULES` via the UI is not fully supported for saving to `user_settings.json`.
+
+### `LLMEditorWidget` (`gui/llm_editor_widget.py`)
+
+*   **Purpose:** Provides a user-friendly interface for viewing and editing the LLM settings defined in `config/llm_settings.json`.
+*   **Implementation:** Uses tabs for "Prompt Settings" and "API Settings". Allows editing the prompt, managing examples, and configuring API details. When saving, it also performs a **granular save**: it loads the current content of `config/llm_settings.json`, identifies only the settings changed by the user in the current session, updates only those values, and saves the modified content back to `config/llm_settings.json` using `configuration.save_llm_config()`.
+
+## Preset File Structure (`Presets/*.json`)
+
+Preset files are the primary way to adapt the tool to new asset sources. Developers should use `Presets/_template.json` as a starting point. Key fields include:
+
+*   `supplier_name`: The name of the asset source (e.g., `"Poliigon"`). Used for output directory naming.
+*   `map_type_mapping`: A list of dictionaries, each mapping source filename patterns/keywords to a specific file type. The `target_type` for this mapping **must** be a key from the `FILE_TYPE_DEFINITIONS` now located in `config/file_type_definitions.json`.
+    *   `target_type`: The specific file type key from `FILE_TYPE_DEFINITIONS` (e.g., `"MAP_COL"`, `"MAP_NORM_GL"`, `"MAP_RGH"`). This replaces previous alias-based systems. The common aliases like "COL" or "NRM" are now derived from the `standard_type` property within `FILE_TYPE_DEFINITIONS` but are not used directly for `target_type`.
+    *   `keywords`: A list of filename patterns (regex or fnmatch-style wildcards) used to identify this map type. The order of keywords within this list, and the order of dictionaries in the `map_type_mapping` list, determines the priority for assigning variant suffixes (`-1`, `-2`, etc.) when multiple files match the same `target_type`.
+*   `bit_depth_variants`: A dictionary mapping standard map types (e.g., `"NRM"`) to a pattern identifying its high bit-depth variant (e.g., `"*_NRM16*.tif"`). Files matching these patterns are prioritized over their standard counterparts.
+*   `map_bit_depth_rules`: Defines how to handle the bit depth of source maps. Can specify a default behavior (`"respect"` or `"force_8bit"`) and overrides for specific map types.
+*   `model_patterns`: A list of regex patterns to identify model files (e.g., `".*\\.fbx"`, `".*\\.obj"`).
+*   `move_to_extra_patterns`: A list of regex patterns for files that should be moved directly to the `Extra/` output subdirectory without further processing.
+*   `source_naming_convention`: Rules for extracting the base asset name and potentially the archetype from source filenames or directory structures (e.g., using separators and indices).
+*   `asset_category_rules`: Keywords or patterns used to determine the asset category (e.g., identifying `"Decal"` based on keywords).
+*   `archetype_rules`: Keywords or patterns used to determine the asset archetype (e.g., identifying `"Wood"` or `"Metal"`).
+
+Careful definition of these patterns and rules, especially the regex in `map_type_mapping`, `bit_depth_variants`, `model_patterns`, and `move_to_extra_patterns`, is essential for correct asset processing.
+
+**Note on Data Passing:** As mentioned in the Architecture documentation, major changes to the data passing mechanisms between the GUI, Main (CLI orchestration), and `AssetProcessor` modules are currently being planned. The descriptions of how configuration data is handled and passed within this document reflect the current state and will require review and updates once the plan for these changes is finalized.
 
 ## Supplier Management (`config/suppliers.json`)
 

Documentation/02_Developer_Guide/06_GUI_Internals.md

@@ -10,13 +10,13 @@ The GUI is built using `PySide6`, which provides Python bindings for the Qt fram
 
 The `MainWindow` class acts as the central **coordinator** for the GUI application. It is responsible for:
 
-*   Setting up the main application window structure and menu bar.
+*   Setting up the main application window structure and menu bar, including actions to launch configuration and definition editors.
 *   **Layout:** Arranging the main GUI components using a `QSplitter`.
     *   **Left Pane:** Contains the preset selection controls (from `PresetEditorWidget`) permanently displayed at the top. Below this, a `QStackedWidget` switches between the preset JSON editor (also from `PresetEditorWidget`) and the `LLMEditorWidget`.
     *   **Right Pane:** Contains the `MainPanelWidget`.
 *   Instantiating and managing the major GUI widgets:
     *   `PresetEditorWidget` (`gui/preset_editor_widget.py`): Provides the preset selector and the JSON editor parts.
-    *   `LLMEditorWidget` (`gui/llm_editor_widget.py`): Provides the editor for LLM settings.
+    *   `LLMEditorWidget` (`gui/llm_editor_widget.py`): Provides the editor for LLM settings (from `config/llm_settings.json`).
     *   `MainPanelWidget` (`gui/main_panel_widget.py`): Contains the rule hierarchy view and processing controls.
     *   `LogConsoleWidget` (`gui/log_console_widget.py`): Displays application logs.
 *   Instantiating key models and handlers:
@@ -198,13 +198,24 @@ The `LogConsoleWidget` displays logs captured by a custom `QtLogHandler` from Py
 
 The GUI provides a "Cancel" button. Cancellation logic for the actual processing is now likely handled within the `main.ProcessingTask` or the code that manages it, as the `ProcessingHandler` has been removed. The GUI button would signal this external task manager.
 
-## GUI Configuration Editor (`gui/config_editor_dialog.py`)
+## Application Preferences Editor (`gui/config_editor_dialog.py`)
 
-A dedicated dialog for editing `config/app_settings.json`.
+A dedicated dialog for editing user-overridable application settings. It loads base settings from `config/app_settings.json` and saves user overrides to `config/user_settings.json`.
 
-*   **Functionality:** Loads `config/app_settings.json`, presents in tabs, allows editing basic fields, definitions tables (with color editing), and merge rules list/detail.
-*   **Limitations:** Editing complex fields like `IMAGE_RESOLUTIONS` or full `MAP_MERGE_RULES` details might still be limited.
-*   **Integration:** Launched by `MainWindow` ("Edit" -> "Preferences...").
-*   **Persistence:** Saves changes to `config/app_settings.json`. Requires application restart for changes to affect processing logic loaded by the `Configuration` class.
+*   **Functionality:** Provides a tabbed interface to edit various application settings, including general paths, output/naming patterns, image processing options (like resolutions and compression), and map merging rules. It no longer includes editors for Asset Type or File Type Definitions.
+*   **Integration:** Launched by `MainWindow` via the "Edit" -> "Preferences..." menu.
+*   **Persistence:** Saves changes to `config/user_settings.json`. Changes require an application restart to take effect in processing logic.
 
 The refactored GUI separates concerns into distinct widgets and handlers, coordinated by the `MainWindow`. Background tasks use `QThreadPool` and `QRunnable`. The `UnifiedViewModel` focuses on data presentation and simple edits, delegating complex restructuring to the `AssetRestructureHandler`.
+
+## Definitions Editor (`gui/definitions_editor_dialog.py`)
+
+A new dedicated dialog for managing core application definitions that are separate from general user preferences.
+
+*   **Purpose:** Provides a structured UI for editing Asset Type Definitions, File Type Definitions, and Supplier Settings.
+*   **Structure:** Uses a `QTabWidget` with three tabs:
+    *   **Asset Type Definitions:** Manages definitions from `config/asset_type_definitions.json`. Presents a list of asset types and allows editing their description, color, and examples.
+    *   **File Type Definitions:** Manages definitions from `config/file_type_definitions.json`. Presents a list of file types and allows editing their description, color, examples, standard type, bit depth rule, grayscale status, and keybind.
+    *   **Supplier Settings:** Manages settings from `config/suppliers.json`. Presents a list of suppliers and allows editing supplier-specific settings (e.g., Normal Map Type).
+*   **Integration:** Launched by `MainWindow` via the "Edit" -> "Edit Definitions..." menu.
+*   **Persistence:** Saves changes directly to the respective configuration files (`config/asset_type_definitions.json`, `config/file_type_definitions.json`, `config/suppliers.json`). Some changes may require an application restart.

Presets/Poliigon.json

@@ -25,102 +25,10 @@
         "*.pdf",
         "*.url",
         "*.htm*",
-        "*_Fabric.*"
-    ],
-    "map_type_mapping": [
-        {
-            "target_type": "MAP_COL",
-            "keywords": [
-                "COLOR*",
-                "COL",
-                "DIFFUSE",
-                "DIF",
-                "ALBEDO"
-            ]
-        },
-        {
-            "target_type": "MAP_NRM",
-            "keywords": [
-                "NORMAL*",
-                "NORM*",
-                "NRM*"
-            ]
-        },
-        {
-            "target_type": "MAP_ROUGH",
-            "keywords": [
-                "ROUGHNESS",
-                "ROUGH"
-            ]
-        },
-        {
-            "target_type": "MAP_GLOSS",
-            "keywords": [
-                "GLOSS"
-            ],
-            "is_gloss_source": true
-        },
-        {
-            "target_type": "MAP_AO",
-            "keywords": [
-                "AMBIENTOCCLUSION",
-                "AO"
-            ]
-        },
-        {
-            "target_type": "MAP_DISP",
-            "keywords": [
-                "DISPLACEMENT",
-                "DISP",
-                "HEIGHT",
-                "BUMP"
-            ]
-        },
-        {
-            "target_type": "MAP_REFL",
-            "keywords": [
-                "REFLECTION",
-                "REFL",
-                "SPECULAR",
-                "SPEC"
-            ]
-        },
-        {
-            "target_type": "MAP_SSS",
-            "keywords": [
-                "SSS",
-                "SUBSURFACE*"
-            ]
-        },
-        {
-            "target_type": "MAP_FUZZ",
-            "keywords": [
-                "FUZZ"
-            ]
-        },
-        {
-            "target_type": "MAP_IDMAP",
-            "keywords": [
-                "IDMAP"
-            ]
-        },
-        {
-            "target_type": "MAP_MASK",
-            "keywords": [
-                "OPAC*",
-                "TRANSP*",
-                "MASK*",
-                "ALPHA*"
-            ]
-        },
-        {
-            "target_type": "MAP_METAL",
-            "keywords": [
-                "METAL*",
-                "METALLIC"
-            ]
-        }
+        "*_Fabric.*",
+        "*_Albedo*"
     ],
+    "map_type_mapping": [],
     "asset_category_rules": {
         "model_patterns": [
             "*.fbx",

ProjectNotes/ConfigurationRefactoringPlan.md

@@ -0,0 +1,107 @@
+# Configuration System Refactoring Plan
+
+This document outlines the plan for refactoring the configuration system of the Asset Processor Tool.
+
+## Overall Goals
+
+1.  **Decouple Definitions:** Separate `ASSET_TYPE_DEFINITIONS` and `FILE_TYPE_DEFINITIONS` from the main `config/app_settings.json` into dedicated files.
+2.  **Introduce User Overrides:** Allow users to override base settings via a new `config/user_settings.json` file.
+3.  **Improve GUI Saving:** (Lower Priority) Make GUI configuration saving more targeted to avoid overwriting unrelated settings when saving changes from `ConfigEditorDialog` or `LLMEditorWidget`.
+
+## Proposed Plan Phases
+
+**Phase 1: Decouple Definitions**
+
+1.  **Create New Definition Files:**
+    *   Create `config/asset_type_definitions.json`.
+    *   Create `config/file_type_definitions.json`.
+2.  **Migrate Content:**
+    *   Move `ASSET_TYPE_DEFINITIONS` object from `config/app_settings.json` to `config/asset_type_definitions.json`.
+    *   Move `FILE_TYPE_DEFINITIONS` object from `config/app_settings.json` to `config/file_type_definitions.json`.
+3.  **Update `configuration.py`:**
+    *   Add constants for new definition file paths.
+    *   Modify `Configuration` class to load these new files.
+    *   Update property methods (e.g., `get_asset_type_definitions`, `get_file_type_definitions_with_examples`) to use data from the new definition dictionaries.
+    *   Adjust validation (`_validate_configs`) as needed.
+4.  **Update GUI & `load_base_config()`:**
+    *   Modify `load_base_config()` to load and return a combined dictionary including `app_settings.json` and the two new definition files.
+    *   Update GUI components relying on `load_base_config()` to ensure they receive the necessary definition data.
+
+**Phase 2: Implement User Overrides**
+
+1.  **Define `user_settings.json`:**
+    *   Establish `config/user_settings.json` for user-specific overrides, mirroring parts of `app_settings.json`.
+2.  **Update `configuration.py` Loading:**
+    *   In `Configuration.__init__`, load `app_settings.json`, then definition files, then attempt to load and deep merge `user_settings.json` (user settings override base).
+    *   Load presets *after* the base+user merge (presets override combined base+user).
+    *   Modify `load_base_config()` to also load and merge `user_settings.json` after `app_settings.json`.
+3.  **Update GUI Editors:**
+    *   Modify `ConfigEditorDialog` to load the effective settings (base+user) but save changes *only* to `config/user_settings.json`.
+    *   `LLMEditorWidget` continues targeting `llm_settings.json`.
+
+**Phase 3: Granular GUI Saving (Lower Priority)**
+
+1.  **Refactor Saving Logic:**
+    *   In `ConfigEditorDialog` and `LLMEditorWidget`:
+        *   Load the current target file (`user_settings.json` or `llm_settings.json`).
+        *   Identify specific setting(s) changed by the user in the GUI session.
+        *   Update only those specific key(s) in the loaded dictionary.
+        *   Write the entire modified dictionary back to the target file, preserving untouched settings.
+
+## Proposed File Structure & Loading Flow
+
+```mermaid
+graph LR
+    subgraph Config Files
+        A[config/asset_type_definitions.json]
+        B[config/file_type_definitions.json]
+        C[config/app_settings.json (Base Defaults)]
+        D[config/user_settings.json (User Overrides)]
+        E[config/llm_settings.json]
+        F[config/suppliers.json]
+        G[Presets/*.json]
+    end
+
+    subgraph Code
+        H[configuration.py]
+        I[GUI]
+        J[Processing Engine / Pipeline]
+        K[LLM Handlers]
+    end
+
+    subgraph Loading Flow (Configuration Class)
+        L(Load Asset Types) --> H
+        M(Load File Types) --> H
+        N(Load Base Settings) --> P(Merge Base + User)
+        O(Load User Settings) --> P
+        P --> R(Merge Preset Overrides)
+        Q(Load LLM Settings) --> H
+        R --> T(Final Config Object)
+        G -- Load Preset --> R
+        H -- Contains --> T
+    end
+
+    subgraph Loading Flow (GUI - load_base_config)
+        L2(Load Asset Types) --> U(Return Merged Defaults + Defs)
+        M2(Load File Types) --> U
+        N2(Load Base Settings) --> V(Merge Base + User)
+        O2(Load User Settings) --> V
+        V --> U
+        I -- Calls --> U
+    end
+
+
+    T -- Used by --> J
+    T -- Used by --> K
+
+    I -- Edits --> D
+    I -- Edits --> E
+    I -- Manages --> F
+
+    style A fill:#f9f,stroke:#333,stroke-width:2px
+    style B fill:#f9f,stroke:#333,stroke-width:2px
+    style C fill:#ccf,stroke:#333,stroke-width:2px
+    style D fill:#9cf,stroke:#333,stroke-width:2px
+    style E fill:#ccf,stroke:#333,stroke-width:2px
+    style F fill:#9cf,stroke:#333,stroke-width:2px
+    style G fill:#ffc,stroke:#333,stroke-width:2px

ProjectNotes/MAP_Prefix_Enforcement_Plan.md

@@ -1,96 +0,0 @@
-# Plan: Enforcing "MAP_" Prefix for Internal Processing and Standard Type for Output Naming
-
-**Date:** 2025-05-13
-
-**I. Goal:**
-The primary goal is to ensure that for all internal processing, the system *exclusively* uses `FileRule.item_type` values that start with the "MAP_" prefix (e.g., "MAP_COL", "MAP_NRM"). The "standard type" (e.g., "COL", "NRM") associated with these "MAP_" types (as defined in `config/app_settings.json`) should *only* be used during the file saving stages for output naming. Any `FileRule` whose `item_type` does not start with "MAP_" (and isn't a special type like "EXTRA" or "MODEL") should be skipped by the relevant map processing stages.
-
-**II. Current State Analysis Summary:**
-
-*   **Output Naming:** The use of "standard type" for output filenames via the `get_filename_friendly_map_type` utility in `SaveVariantsStage` and `OutputOrganizationStage` is **correct** and already meets the requirement.
-*   **Internal "MAP_" Prefix Usage:**
-    *   Some stages like `GlossToRoughConversionStage` correctly check for "MAP_" prefixes (e.g., `processing_map_type.startswith("MAP_GLOSS")`).
-    *   Other stages like `RegularMapProcessorStage` and `MergedTaskProcessorStage` (and its helpers) implicitly expect "MAP_" prefixed types for their internal regex-based logic but lack explicit checks to skip items if the prefix is missing.
-    *   Stages like `AlphaExtractionToMaskStage` and `NormalMapGreenChannelStage` currently use non-"MAP_" prefixed "standard types" (e.g., "NORMAL", "ALBEDO") when reading from `context.processed_maps_details` for their decision-making logic.
-    *   The `PrepareProcessingItemsStage` adds `FileRule`s to the processing queue without filtering based on the "MAP_" prefix in `item_type`.
-*   **Data Consistency in `AssetProcessingContext`:**
-    *   `FileRule.item_type` is the field that should hold the "MAP_" prefixed type from the initial rule generation.
-    *   `context.processed_maps_details` entries can contain various map type representations:
-        *   `map_type`: Often stores the "standard type" (e.g., "Roughness", "MASK", "NORMAL").
-        *   `processing_map_type` / `internal_map_type`: Generally seem to store the "MAP_" prefixed type. This needs to be consistent.
-*   **Configuration (`config/app_settings.json`):**
-    *   `FILE_TYPE_DEFINITIONS` correctly use "MAP_" prefixed keys.
-    *   `MAP_MERGE_RULES` need to be reviewed to ensure their `output_map_type` and input map types are "MAP_" prefixed.
-
-**III. Proposed Changes (Code Identification & Recommendations):**
-
-**A. Enforce "MAP_" Prefix for Processing Items (Skipping Logic):**
-The core requirement is that processing stages should skip `FileRule` items if their `item_type` doesn't start with "MAP_".
-
-1.  **`RegularMapProcessorStage` (`processing/pipeline/stages/regular_map_processor.py`):**
-    *   **Identify:** In the `execute` method, `initial_internal_map_type` is derived from `file_rule.item_type_override` or `file_rule.item_type`.
-    *   **Recommend:** Add an explicit check after determining `initial_internal_map_type`. If `initial_internal_map_type` does not start with `"MAP_"`, the stage should log a warning, set the `result.status` to "Skipped (Invalid Type)" or similar, and return `result` early, effectively skipping processing for this item.
-
-2.  **`MergedTaskProcessorStage` (`processing/pipeline/stages/merged_task_processor.py`):**
-    *   **Identify:** This stage processes `MergeTaskDefinition`s. The definitions for these tasks (input types, output type) come from `MAP_MERGE_RULES` in `config/app_settings.json`. The stage uses `required_map_type_from_rule` for its inputs.
-    *   **Recommend:**
-        *   **Configuration First:** Review all entries in `MAP_MERGE_RULES` in `config/app_settings.json`.
-            *   Ensure the `output_map_type` for each rule (e.g., "MAP_NRMRGH") starts with "MAP_".
-            *   Ensure all map type values within the `inputs` dictionary (e.g., `"R": "MAP_NRM"`) start with "MAP_".
-        *   **Stage Logic:** In the `execute` method, when iterating through `merge_inputs_config.items()`, check if `required_map_type_from_rule` starts with `"MAP_"`. If not, log a warning and either:
-            *   Skip loading/processing this specific input channel (potentially using its fallback if the overall merge can still proceed).
-            *   Or, if a non-"MAP_" input is critical, fail the entire merge task for this asset.
-        *   The helper `_apply_in_memory_transformations` already uses regex expecting "MAP_" prefixes; this will naturally fail or misbehave if inputs are not "MAP_" prefixed, reinforcing the need for the check above.
-
-**B. Standardize Map Type Fields and Usage in `context.processed_maps_details`:**
-Ensure consistency in how "MAP_" prefixed types are stored and accessed within `context.processed_maps_details` for internal logic (not naming).
-
-1.  **Recommendation:** Establish a single, consistent field name within `context.processed_maps_details` to store the definitive "MAP_" prefixed internal map type (e.g., `internal_map_type` or `processing_map_type`). All stages that perform logic based on the specific *kind* of map (e.g., transformations, source selection) should read from this standardized field. The `map_type` field can continue to store the "standard type" (e.g., "Roughness") primarily for informational/metadata purposes if needed, but not for core processing logic.
-
-2.  **`AlphaExtractionToMaskStage` (`processing/pipeline/stages/alpha_extraction_to_mask.py`):**
-    *   **Identify:**
-        *   Checks for existing MASK map using `file_rule.map_type == "MASK"`. (Discrepancy: `FileRule` uses `item_type`).
-        *   Searches for suitable source maps using `details.get('map_type') in self.SUITABLE_SOURCE_MAP_TYPES` where `SUITABLE_SOURCE_MAP_TYPES` are standard types like "ALBEDO".
-        *   When adding new details, it sets `map_type: "MASK"` and the new `FileRule` gets `item_type="MAP_MASK"`.
-    *   **Recommend:**
-        *   Change the check for an existing MASK map to `file_rule.item_type == "MAP_MASK"`.
-        *   Modify the source map search to use the standardized "MAP_" prefixed field from `details` (e.g., `details.get('internal_map_type')`) and update `SUITABLE_SOURCE_MAP_TYPES` to be "MAP_" prefixed (e.g., "MAP_COL", "MAP_ALBEDO").
-        *   When adding new details for the created MASK map to `context.processed_maps_details`, ensure the standardized "MAP_" prefixed field is set to "MAP_MASK", and `map_type` (if kept) is "MASK".
-
-3.  **`NormalMapGreenChannelStage` (`processing/pipeline/stages/normal_map_green_channel.py`):**
-    *   **Identify:** Checks `map_details.get('map_type') == "NORMAL"`.
-    *   **Recommend:** Change this check to use the standardized "MAP_" prefixed field from `map_details` (e.g., `map_details.get('internal_map_type')`) and verify if it `startswith("MAP_NRM")`.
-
-4.  **`GlossToRoughConversionStage` (`processing/pipeline/stages/gloss_to_rough_conversion.py`):**
-    *   **Identify:** This stage already uses `processing_map_type.startswith("MAP_GLOSS")` and updates `processing_map_type` to "MAP_ROUGH" in `map_details`. It also updates the `FileRule.item_type` correctly.
-    *   **Recommend:** This stage is largely consistent. Ensure the field it reads/writes (`processing_map_type`) aligns with the chosen standardized "MAP_" prefixed field for `processed_maps_details`.
-
-**C. Review Orchestration Logic (Conceptual):**
-*   When the orchestrator populates `context.processed_maps_details` after stages like `SaveVariantsStage`, ensure it stores the "MAP_" prefixed `internal_map_type` (from `SaveVariantsInput`) into the chosen standardized field in `processed_maps_details`.
-
-**IV. Testing Recommendations:**
-
-*   Create test cases with `AssetRule`s containing `FileRule`s where `item_type` is intentionally set to a non-"MAP_" prefixed value (e.g., "COLOR_MAP", "TEXTURE_ROUGH"). Verify that `RegularMapProcessorStage` skips these.
-*   Modify `MAP_MERGE_RULES` in a test configuration:
-    *   Set an `output_map_type` to a non-"MAP_" value.
-    *   Set an input map type (e.g., for channel "R") to a non-"MAP_" value.
-    *   Verify that `MergedTaskProcessorStage` correctly handles these (e.g., fails the task, skips the input, logs warnings).
-*   Test `AlphaExtractionToMaskStage`:
-    *   With an existing `FileRule` having `item_type="MAP_MASK"` to ensure extraction is skipped.
-    *   With source maps having "MAP_COL" (with alpha) as their `internal_map_type` in `processed_maps_details` to ensure they are correctly identified as sources.
-*   Test `NormalMapGreenChannelStage` with a normal map having "MAP_NRM" as its `internal_map_type` in `processed_maps_details` to ensure it's processed.
-*   Verify that output filenames continue to use the "standard type" (e.g., "COL", "ROUGH", "NRM") correctly.
-
-**V. Mermaid Diagram (Illustrative Flow for `FileRule` Processing):**
-
-```mermaid
-graph TD
-    A[AssetRule with FileRules] --> B{FileRuleFilterStage};
-    B -- files_to_process --> C{PrepareProcessingItemsStage};
-    C -- processing_items (FileRule) --> D{PipelineOrchestrator};
-    D -- FileRule --> E(RegularMapProcessorStage);
-    E --> F{Check FileRule.item_type};
-    F -- Starts with "MAP_"? --> G[Process Map];
-    F -- No --> H[Skip Map / Log Warning];
-    G --> I[...subsequent stages...];
-    H --> I;

ProjectNotes/PipelineRefactoringPlan.md

@@ -1,72 +0,0 @@
-# Processing Pipeline Refactoring Plan
-
-## 1. Problem Summary
-
-The current processing pipeline, particularly the `IndividualMapProcessingStage`, exhibits maintainability challenges:
-
-*   **High Complexity:** The stage handles too many responsibilities (loading, merging, transformations, scaling, saving).
-*   **Duplicated Logic:** Image transformations (Gloss-to-Rough, Normal Green Invert) are duplicated within the stage instead of relying solely on dedicated stages or being handled consistently.
-*   **Tight Coupling:** Heavy reliance on the large, mutable `AssetProcessingContext` object creates implicit dependencies and makes isolated testing difficult.
-
-## 2. Refactoring Goals
-
-*   Improve code readability and understanding.
-*   Enhance maintainability by localizing changes and removing duplication.
-*   Increase testability through smaller, focused components with clear interfaces.
-*   Clarify data dependencies between pipeline stages.
-*   Adhere more closely to the Single Responsibility Principle (SRP).
-
-## 3. Proposed New Pipeline Stages
-
-Replace the existing `IndividualMapProcessingStage` with the following sequence of smaller, focused stages, executed by the `PipelineOrchestrator` for each processing item:
-
-1.  **`PrepareProcessingItemsStage`:**
-    *   **Responsibility:** Identifies and lists all items (`FileRule`, `MergeTaskDefinition`) to be processed from the main context.
-    *   **Output:** Updates `context.processing_items`.
-
-2.  **`RegularMapProcessorStage`:** (Handles `FileRule` items)
-    *   **Responsibility:** Loads source image, determines internal map type (with suffix), applies relevant transformations (Gloss-to-Rough, Normal Green Invert), determines original metadata.
-    *   **Output:** `ProcessedRegularMapData` object containing transformed image data and metadata.
-
-3.  **`MergedTaskProcessorStage`:** (Handles `MergeTaskDefinition` items)
-    *   **Responsibility:** Loads input images, applies transformations to inputs, handles fallbacks/resizing, performs merge operation.
-    *   **Output:** `ProcessedMergedMapData` object containing merged image data and metadata.
-
-4.  **`InitialScalingStage`:** (Optional)
-    *   **Responsibility:** Applies configured scaling (e.g., POT downscale) to the processed image data received from the previous stage.
-    *   **Output:** Scaled image data.
-
-5.  **`SaveVariantsStage`:**
-    *   **Responsibility:** Takes the final processed (and potentially scaled) image data and orchestrates saving variants using the `save_image_variants` utility.
-    *   **Output:** List of saved file details (`saved_files_details`).
-
-## 4. Proposed Data Flow
-
-*   **Input/Output Objects:** Key stages (`RegularMapProcessor`, `MergedTaskProcessor`, `InitialScaling`, `SaveVariants`) will use specific Input and Output dataclasses for clearer interfaces.
-*   **Orchestrator Role:** The `PipelineOrchestrator` manages the overall flow. It calls stages, passes necessary data (extracting image data references and metadata from previous stage outputs to create inputs for the next), receives output objects, and integrates final results (like saved file details) back into the main `AssetProcessingContext`.
-*   **Image Data Handling:** Large image arrays (`np.ndarray`) are passed primarily via stage return values (Output objects) and used as inputs to subsequent stages, managed by the Orchestrator. They are not stored long-term in the main `AssetProcessingContext`.
-*   **Main Context:** The `AssetProcessingContext` remains for overall state (rules, paths, configuration access, final status tracking) and potentially for simpler stages with minimal side effects.
-
-## 5. Visualization (Conceptual)
-
-```mermaid
-graph TD
-    subgraph Proposed Pipeline Stages
-        Start --> Prep[PrepareProcessingItemsStage]
-        Prep --> ItemLoop{Loop per Item}
-        ItemLoop -- FileRule --> RegProc[RegularMapProcessorStage]
-        ItemLoop -- MergeTask --> MergeProc[MergedTaskProcessorStage]
-        RegProc --> Scale(InitialScalingStage)
-        MergeProc --> Scale
-        Scale --> Save[SaveVariantsStage]
-        Save --> UpdateContext[Update Main Context w/ Results]
-        UpdateContext --> ItemLoop
-    end
-```
-
-## 6. Benefits
-
-*   Improved Readability & Understanding.
-*   Enhanced Maintainability & Reduced Risk.
-*   Better Testability.
-*   Clearer Dependencies.

ProjectNotes/issue_definitions_editor_list_selection.md

@@ -0,0 +1,62 @@
+# Issue: List item selection not working in Definitions Editor
+
+**Date:** 2025-05-13
+
+**Affected File:** [`gui/definitions_editor_dialog.py`](gui/definitions_editor_dialog.py)
+
+**Problem Description:**
+User mouse clicks on items within the `QListWidget` instances (for Asset Types, File Types, and Suppliers) in the Definitions Editor dialog do not trigger item selection or the `currentItemChanged` signal. The first item is selected by default and its details are displayed correctly. Programmatic selection of items (e.g., via a diagnostic button) *does* correctly trigger the `currentItemChanged` signal and updates the UI detail views. The issue is specific to user-initiated mouse clicks for selection after the initial load.
+
+**Debugging Steps Taken & Findings:**
+
+1.  **Initial Analysis:**
+    *   Reviewed GUI internals documentation ([`Documentation/02_Developer_Guide/06_GUI_Internals.md`](Documentation/02_Developer_Guide/06_GUI_Internals.md)) and [`gui/definitions_editor_dialog.py`](gui/definitions_editor_dialog.py) source code.
+    *   Confirmed signal connections (`currentItemChanged` to display slots) are made.
+
+2.  **Logging in Display Slots (`_display_*_details`):**
+    *   Added logging to display slots. Confirmed they are called for the initial (default) item selection.
+    *   No further calls to these slots occur on user clicks, indicating `currentItemChanged` is not firing.
+
+3.  **Color Swatch Palette Role:**
+    *   Investigated and corrected `QPalette.ColorRole` for color swatches (reverted from `Background` to `Window`). This fixed an `AttributeError` but did not resolve the selection issue.
+
+4.  **Robust Error Handling in Display Slots:**
+    *   Wrapped display slot logic in `try...finally` blocks with detailed logging. Confirmed slots complete without error for initial selection and signals for detail widgets are reconnected.
+
+5.  **Diagnostic Lambda for `currentItemChanged`:**
+    *   Added a lambda logger to `currentItemChanged` alongside the main display slot.
+    *   Confirmed both lambda and display slot fire for initial programmatic selection.
+    *   Neither fires for subsequent user clicks. This proved the `QListWidget` itself was not emitting the signal.
+
+6.  **Explicit `setEnabled` and `setSelectionMode` on `QListWidget`:**
+    *   Explicitly set these properties. No change in behavior.
+
+7.  **Explicit `setEnabled` and `setFocusPolicy(Qt.ClickFocus)` on `tab_page` (parent of `QListWidget` layout):**
+    *   This change **allowed programmatic selection via a diagnostic button to correctly fire `currentItemChanged` and update the UI**.
+    *   However, user mouse clicks still did not work and did not fire the signal.
+
+8.  **Event Filter Investigation:**
+    *   **Filter on `QListWidget`:** Did NOT receive mouse press/release events from user clicks.
+    *   **Filter on `tab_page` (parent of `QListWidget`'s layout):** Did NOT receive mouse press/release events.
+    *   **Filter on `self.tab_widget` (QTabWidget):** DID receive mouse press/release events.
+    *   Modified `self.tab_widget`'s event filter to return `False` for events over the current page, attempting to ensure propagation.
+    *   **Result:** With the modified `tab_widget` filter, an event filter re-added to `asset_type_list_widget` *did* start receiving mouse press/release events. **However, `asset_type_list_widget` still did not emit `currentItemChanged` from these user clicks.**
+
+9.  **`DebugListWidget` (Subclassing `QListWidget`):**
+    *   Created `DebugListWidget` overriding `mousePressEvent` with logging.
+    *   Used `DebugListWidget` for `asset_type_list_widget`.
+    *   **Initial user report indicated that `DebugListWidget.mousePressEvent` logs were NOT appearing for user clicks.** This means that even with the `QTabWidget` event filter attempting to propagate events, and the `asset_type_list_widget`'s filter (from step 8) confirming it received them, the `mousePressEvent` of the `QListWidget` itself was not being triggered by those propagated events. This is the current mystery.
+
+**Current Status:**
+- Programmatic selection works and fires signals.
+- User clicks are received by an event filter on `asset_type_list_widget` (after `QTabWidget` filter modification) but do not result in `mousePressEvent` being called on the `QListWidget` (or `DebugListWidget`) itself, and thus no `currentItemChanged` signal is emitted.
+- The issue seems to be a very low-level event processing problem specifically for user mouse clicks within the `QListWidget` instances when they are children of the `QTabWidget` pages, even when events appear to reach the list widget via an event filter.
+
+**Next Steps (When Resuming):**
+1.  Re-verify the logs from the `DebugListWidget.mousePressEvent` test. If it's truly not being called despite its event filter seeing events, this is extremely unusual.
+2.  Simplify the `_create_tab_pane` method drastically for one tab:
+    *   Remove the right-hand pane.
+    *   Add the `DebugListWidget` directly to the `tab_page`'s layout without the intermediate `left_pane_layout`.
+3.  Consider if any styles applied to `QListWidget` or its parents via stylesheets could be interfering with hit testing or event processing (unlikely for this specific symptom, but possible).
+4.  Explore alternative ways to populate/manage the `QListWidget` or its items if a subtle corruption is occurring.
+5.  If all else fails, consider replacing the `QListWidget` with a `QListView` and a `QStringListModel` as a more fundamental change to see if the issue is specific to `QListWidget` in this context.

config/app_settings.json

@@ -1,245 +1,4 @@
 {
-    "ASSET_TYPE_DEFINITIONS": {
-        "Surface": {
-            "description": "A single Standard PBR material set for a surface.",
-            "color": "#1f3e5d",
-            "examples": [
-                "Set: Wood01_COL + Wood01_NRM + WOOD01_ROUGH",
-                "Set: Dif_Concrete + Normal_Concrete + Refl_Concrete"
-            ]
-        },
-        "Model": {
-            "description": "A set that contains models, can include PBR textureset",
-            "color": "#b67300",
-            "examples": [
-                "Single = Chair.fbx",
-                "Set = Plant02.fbx + Plant02_col + Plant02_SSS"
-            ]
-        },
-        "Decal": {
-            "description": "A alphamasked textureset",
-            "color": "#68ac68",
-            "examples": [
-                "Set = DecalGraffiti01_Col + DecalGraffiti01_Alpha",
-                "Single = DecalLeakStain03"
-            ]
-        },
-        "Atlas": {
-            "description": "A texture, name usually hints that it's an atlas",
-            "color": "#955b8b",
-            "examples": [
-                "Set = FoliageAtlas01_col + FoliageAtlas01_nrm"
-            ]
-        },
-        "UtilityMap": {
-            "description": "A useful image-asset consisting of only a single texture. Therefor each Utilitymap can only contain a single item.",
-            "color": "#706b87",
-            "examples": [
-                "Single = imperfection.png",
-                "Single = smudges.png",
-                "Single = scratches.tif"
-            ]
-        }
-    },
-    "FILE_TYPE_DEFINITIONS": {
-        "MAP_COL": {
-            "description": "Color/Albedo Map",
-            "color": "#ffaa00",
-            "examples": [
-                "_col.",
-                "_basecolor.",
-                "albedo",
-                "diffuse"
-            ],
-            "standard_type": "COL",
-            "bit_depth_rule": "force_8bit",
-            "is_grayscale": false,
-            "keybind": "C"
-        },
-        "MAP_NRM": {
-            "description": "Normal Map",
-            "color": "#cca2f1",
-            "examples": [
-                "_nrm.",
-                "_normal."
-            ],
-            "standard_type": "NRM",
-            "bit_depth_rule": "respect",
-            "is_grayscale": false,
-            "keybind": "N"
-        },
-        "MAP_METAL": {
-            "description": "Metalness Map",
-            "color": "#dcf4f2",
-            "examples": [
-                "_metal.",
-                "_met."
-            ],
-            "standard_type": "METAL",
-            "bit_depth_rule": "force_8bit",
-            "is_grayscale": true,
-            "keybind": "M"
-        },
-        "MAP_ROUGH": {
-            "description": "Roughness Map",
-            "color": "#bfd6bf",
-            "examples": [
-                "_rough.",
-                "_rgh.",
-                "_gloss"
-            ],
-            "standard_type": "ROUGH",
-            "bit_depth_rule": "force_8bit",
-            "is_grayscale": true,
-            "keybind": "R"
-        },
-        "MAP_GLOSS": {
-            "description": "Glossiness Map",
-            "color": "#d6bfd6",
-            "examples": [
-                "_gloss.",
-                "_gls."
-            ],
-            "standard_type": "GLOSS",
-            "bit_depth_rule": "force_8bit",
-            "is_grayscale": true,
-            "keybind": "R"
-        },
-        "MAP_AO": {
-            "description": "Ambient Occlusion Map",
-            "color": "#e3c7c7",
-            "examples": [
-                "_ao.",
-                "_ambientocclusion."
-            ],
-            "standard_type": "AO",
-            "bit_depth_rule": "force_8bit",
-            "is_grayscale": true
-        },
-        "MAP_DISP": {
-            "description": "Displacement/Height Map",
-            "color": "#c6ddd5",
-            "examples": [
-                "_disp.",
-                "_height."
-            ],
-            "standard_type": "DISP",
-            "bit_depth_rule": "respect",
-            "is_grayscale": true,
-            "keybind": "D"
-        },
-        "MAP_REFL": {
-            "description": "Reflection/Specular Map",
-            "color": "#c2c2b9",
-            "examples": [
-                "_refl.",
-                "_specular."
-            ],
-            "standard_type": "REFL",
-            "bit_depth_rule": "force_8bit",
-            "is_grayscale": true,
-            "keybind": "M"
-        },
-        "MAP_SSS": {
-            "description": "Subsurface Scattering Map",
-            "color": "#a0d394",
-            "examples": [
-                "_sss.",
-                "_subsurface."
-            ],
-            "standard_type": "SSS",
-            "bit_depth_rule": "respect",
-            "is_grayscale": true
-        },
-        "MAP_FUZZ": {
-            "description": "Fuzz/Sheen Map",
-            "color": "#a2d1da",
-            "examples": [
-                "_fuzz.",
-                "_sheen."
-            ],
-            "standard_type": "FUZZ",
-            "bit_depth_rule": "force_8bit",
-            "is_grayscale": true
-        },
-        "MAP_IDMAP": {
-            "description": "ID Map (for masking)",
-            "color": "#ca8fb4",
-            "examples": [
-                "_id.",
-                "_matid."
-            ],
-            "standard_type": "IDMAP",
-            "bit_depth_rule": "force_8bit",
-            "is_grayscale": false
-        },
-        "MAP_MASK": {
-            "description": "Generic Mask Map",
-            "color": "#c6e2bf",
-            "examples": [
-                "_mask."
-            ],
-            "standard_type": "MASK",
-            "bit_depth_rule": "force_8bit",
-            "is_grayscale": true
-        },
-        "MAP_IMPERFECTION": {
-            "description": "Imperfection Map (scratches, dust)",
-            "color": "#e6d1a6",
-            "examples": [
-                "_imp.",
-                "_imperfection.",
-                "splatter",
-                "scratches",
-                "smudges",
-                "hairs",
-                "fingerprints"
-            ],
-            "standard_type": "IMPERFECTION",
-            "bit_depth_rule": "force_8bit",
-            "is_grayscale": true
-        },
-        "MODEL": {
-            "description": "3D Model File",
-            "color": "#3db2bd",
-            "examples": [
-                ".fbx",
-                ".obj"
-            ],
-            "standard_type": "",
-            "bit_depth_rule": "",
-            "is_grayscale": false
-        },
-        "EXTRA": {
-            "description": "asset previews or metadata",
-            "color": "#8c8c8c",
-            "examples": [
-                ".txt",
-                ".zip",
-                "preview.",
-                "_flat.",
-                "_sphere.",
-                "_Cube.",
-                "thumb"
-            ],
-            "standard_type": "",
-            "bit_depth_rule": "",
-            "is_grayscale": false,
-            "keybind": "E"
-        },
-        "FILE_IGNORE": {
-            "description": "File to be ignored",
-            "color": "#673d35",
-            "examples": [
-                "Thumbs.db",
-                ".DS_Store"
-            ],
-            "standard_type": "",
-            "bit_depth_rule": "",
-            "is_grayscale": false,
-            "keybind": "X"
-        }
-    },
     "TARGET_FILENAME_PATTERN": "{base_name}_{map_type}_{resolution}.{ext}",
     "RESPECT_VARIANT_MAP_TYPES": [
         "COL"

config/asset_type_definitions.json

@@ -0,0 +1,44 @@
+{
+    "ASSET_TYPE_DEFINITIONS": {
+        "Surface": {
+            "color": "#1f3e5d",
+            "description": "A single Standard PBR material set for a surface.",
+            "examples": [
+                "Set: Wood01_COL + Wood01_NRM + WOOD01_ROUGH",
+                "Set: Dif_Concrete + Normal_Concrete + Refl_Concrete"
+            ]
+        },
+        "Model": {
+            "color": "#b67300",
+            "description": "A set that contains models, can include PBR textureset",
+            "examples": [
+                "Single = Chair.fbx",
+                "Set = Plant02.fbx + Plant02_col + Plant02_SSS"
+            ]
+        },
+        "Decal": {
+            "color": "#68ac68",
+            "description": "A alphamasked textureset",
+            "examples": [
+                "Set = DecalGraffiti01_Col + DecalGraffiti01_Alpha",
+                "Single = DecalLeakStain03"
+            ]
+        },
+        "Atlas": {
+            "color": "#955b8b",
+            "description": "A texture, name usually hints that it's an atlas",
+            "examples": [
+                "Set = FoliageAtlas01_col + FoliageAtlas01_nrm"
+            ]
+        },
+        "UtilityMap": {
+            "color": "#706b87",
+            "description": "A useful image-asset consisting of only a single texture. Therefor each Utilitymap can only contain a single item.",
+            "examples": [
+                "Single = imperfection.png",
+                "Single = smudges.png",
+                "Single = scratches.tif"
+            ]
+        }
+    }
+}

config/file_type_definitions.json

@@ -0,0 +1,208 @@
+{
+    "FILE_TYPE_DEFINITIONS": {
+        "MAP_COL": {
+            "bit_depth_rule": "force_8bit",
+            "color": "#ffaa00",
+            "description": "Color/Albedo Map",
+            "examples": [
+                "_col.",
+                "_basecolor.",
+                "albedo",
+                "diffuse"
+            ],
+            "is_grayscale": false,
+            "keybind": "C",
+            "standard_type": "COL"
+        },
+        "MAP_NRM": {
+            "bit_depth_rule": "respect",
+            "color": "#cca2f1",
+            "description": "Normal Map",
+            "examples": [
+                "_nrm.",
+                "_normal."
+            ],
+            "is_grayscale": false,
+            "keybind": "N",
+            "standard_type": "NRM"
+        },
+        "MAP_METAL": {
+            "bit_depth_rule": "force_8bit",
+            "color": "#dcf4f2",
+            "description": "Metalness Map",
+            "examples": [
+                "_metal.",
+                "_met."
+            ],
+            "is_grayscale": true,
+            "keybind": "M",
+            "standard_type": "METAL"
+        },
+        "MAP_ROUGH": {
+            "bit_depth_rule": "force_8bit",
+            "color": "#bfd6bf",
+            "description": "Roughness Map",
+            "examples": [
+                "_rough.",
+                "_rgh.",
+                "_gloss"
+            ],
+            "is_grayscale": true,
+            "keybind": "R",
+            "standard_type": "ROUGH"
+        },
+        "MAP_GLOSS": {
+            "bit_depth_rule": "force_8bit",
+            "color": "#d6bfd6",
+            "description": "Glossiness Map",
+            "examples": [
+                "_gloss.",
+                "_gls."
+            ],
+            "is_grayscale": true,
+            "keybind": "R",
+            "standard_type": "GLOSS"
+        },
+        "MAP_AO": {
+            "bit_depth_rule": "force_8bit",
+            "color": "#e3c7c7",
+            "description": "Ambient Occlusion Map",
+            "examples": [
+                "_ao.",
+                "_ambientocclusion."
+            ],
+            "is_grayscale": true,
+            "keybind": "",
+            "standard_type": "AO"
+        },
+        "MAP_DISP": {
+            "bit_depth_rule": "respect",
+            "color": "#c6ddd5",
+            "description": "Displacement/Height Map",
+            "examples": [
+                "_disp.",
+                "_height."
+            ],
+            "is_grayscale": true,
+            "keybind": "D",
+            "standard_type": "DISP"
+        },
+        "MAP_REFL": {
+            "bit_depth_rule": "force_8bit",
+            "color": "#c2c2b9",
+            "description": "Reflection/Specular Map",
+            "examples": [
+                "_refl.",
+                "_specular."
+            ],
+            "is_grayscale": true,
+            "keybind": "M",
+            "standard_type": "REFL"
+        },
+        "MAP_SSS": {
+            "bit_depth_rule": "respect",
+            "color": "#a0d394",
+            "description": "Subsurface Scattering Map",
+            "examples": [
+                "_sss.",
+                "_subsurface."
+            ],
+            "is_grayscale": true,
+            "keybind": "",
+            "standard_type": "SSS"
+        },
+        "MAP_FUZZ": {
+            "bit_depth_rule": "force_8bit",
+            "color": "#a2d1da",
+            "description": "Fuzz/Sheen Map",
+            "examples": [
+                "_fuzz.",
+                "_sheen."
+            ],
+            "is_grayscale": true,
+            "keybind": "",
+            "standard_type": "FUZZ"
+        },
+        "MAP_IDMAP": {
+            "bit_depth_rule": "force_8bit",
+            "color": "#ca8fb4",
+            "description": "ID Map (for masking)",
+            "examples": [
+                "_id.",
+                "_matid."
+            ],
+            "is_grayscale": false,
+            "keybind": "",
+            "standard_type": "IDMAP"
+        },
+        "MAP_MASK": {
+            "bit_depth_rule": "force_8bit",
+            "color": "#c6e2bf",
+            "description": "Generic Mask Map",
+            "examples": [
+                "_mask."
+            ],
+            "is_grayscale": true,
+            "keybind": "",
+            "standard_type": "MASK"
+        },
+        "MAP_IMPERFECTION": {
+            "bit_depth_rule": "force_8bit",
+            "color": "#e6d1a6",
+            "description": "Imperfection Map (scratches, dust)",
+            "examples": [
+                "_imp.",
+                "_imperfection.",
+                "splatter",
+                "scratches",
+                "smudges",
+                "hairs",
+                "fingerprints"
+            ],
+            "is_grayscale": true,
+            "keybind": "",
+            "standard_type": "IMPERFECTION"
+        },
+        "MODEL": {
+            "bit_depth_rule": "",
+            "color": "#3db2bd",
+            "description": "3D Model File",
+            "examples": [
+                ".fbx",
+                ".obj"
+            ],
+            "is_grayscale": false,
+            "keybind": "",
+            "standard_type": ""
+        },
+        "EXTRA": {
+            "bit_depth_rule": "",
+            "color": "#8c8c8c",
+            "description": "asset previews or metadata",
+            "examples": [
+                ".txt",
+                ".zip",
+                "preview.",
+                "_flat.",
+                "_sphere.",
+                "_Cube.",
+                "thumb"
+            ],
+            "is_grayscale": false,
+            "keybind": "E",
+            "standard_type": ""
+        },
+        "FILE_IGNORE": {
+            "bit_depth_rule": "",
+            "color": "#673d35",
+            "description": "File to be ignored",
+            "examples": [
+                "Thumbs.db",
+                ".DS_Store"
+            ],
+            "is_grayscale": false,
+            "keybind": "X",
+            "standard_type": ""
+        }
+    }
+}

config/suppliers.json

@@ -1,5 +1,11 @@
-[
-    "Dimensiva",
-    "Dinesen",
-    "Poliigon"
-]
+{
+  "Dimensiva": {
+    "normal_map_type": "OpenGL"
+  },
+  "Dinesen": {
+    "normal_map_type": "OpenGL"
+  },
+  "Poliigon": {
+    "normal_map_type": "OpenGL"
+  }
+}

configuration.py

@@ -3,12 +3,17 @@ import os
 from pathlib import Path
 import logging
 import re
+import collections.abc
 
 log = logging.getLogger(__name__)
 
 BASE_DIR = Path(__file__).parent
 APP_SETTINGS_PATH = BASE_DIR / "config" / "app_settings.json"
 LLM_SETTINGS_PATH = BASE_DIR / "config" / "llm_settings.json"
+ASSET_TYPE_DEFINITIONS_PATH = BASE_DIR / "config" / "asset_type_definitions.json"
+FILE_TYPE_DEFINITIONS_PATH = BASE_DIR / "config" / "file_type_definitions.json"
+USER_SETTINGS_PATH = BASE_DIR / "config" / "user_settings.json" # New path for user settings
+SUPPLIERS_CONFIG_PATH = BASE_DIR / "config" / "suppliers.json"
 PRESETS_DIR = BASE_DIR / "Presets"
 
 class ConfigurationError(Exception):
@@ -64,6 +69,25 @@ def _fnmatch_to_regex(pattern: str) -> str:
     # For filename matching, we usually want to find the pattern, not match the whole string.
     return res
 
+def _deep_merge_dicts(base_dict: dict, override_dict: dict) -> dict:
+    """
+    Recursively merges override_dict into base_dict.
+    If a key exists in both and both values are dicts, it recursively merges them.
+    Otherwise, the value from override_dict takes precedence.
+    Modifies base_dict in place and returns it.
+    """
+    for key, value in override_dict.items():
+        if isinstance(value, collections.abc.Mapping):
+            node = base_dict.get(key) # Use .get() to avoid creating empty dicts if not needed for override
+            if isinstance(node, collections.abc.Mapping):
+                _deep_merge_dicts(node, value) # node is base_dict[key], modified in place
+            else:
+                # If base_dict[key] is not a dict or doesn't exist, override it
+                base_dict[key] = value
+        else:
+            base_dict[key] = value
+    return base_dict
+
 
 class Configuration:
     """
@@ -71,7 +95,7 @@ class Configuration:
     """
     def __init__(self, preset_name: str):
         """
-        Loads core config and the specified preset file.
+        Loads core config, user overrides, and the specified preset file.
 
         Args:
             preset_name: The name of the preset (without .json extension).
@@ -81,9 +105,32 @@ class Configuration:
         """
         log.debug(f"Initializing Configuration with preset: '{preset_name}'")
         self.preset_name = preset_name
+
+        # 1. Load core settings
         self._core_settings: dict = self._load_core_config()
+
+        # 2. Load asset type definitions
+        self._asset_type_definitions: dict = self._load_asset_type_definitions()
+
+        # 3. Load file type definitions
+        self._file_type_definitions: dict = self._load_file_type_definitions()
+
+        # 4. Load user settings
+        user_settings_overrides: dict = self._load_user_settings()
+
+        # 5. Deep merge user settings onto core settings
+        if user_settings_overrides:
+            log.info("Applying user setting overrides to core settings.")
+            # _deep_merge_dicts modifies self._core_settings in place
+            _deep_merge_dicts(self._core_settings, user_settings_overrides)
+        
+        # 6. Load LLM settings
         self._llm_settings: dict = self._load_llm_config()
+
+        # 7. Load preset settings (conceptually overrides combined base + user for shared keys)
         self._preset_settings: dict = self._load_preset(preset_name)
+        
+        # 8. Validate and compile (after all base/user/preset settings are established)
         self._validate_configs()
         self._compile_regex_patterns()
         log.info(f"Configuration loaded successfully using preset: '{self.preset_name}'")
@@ -215,9 +262,79 @@ class Configuration:
         except Exception as e:
             raise ConfigurationError(f"Failed to read preset file {preset_file}: {e}")
 
+    def _load_asset_type_definitions(self) -> dict:
+        """Loads asset type definitions from the asset_type_definitions.json file."""
+        log.debug(f"Loading asset type definitions from: {ASSET_TYPE_DEFINITIONS_PATH}")
+        if not ASSET_TYPE_DEFINITIONS_PATH.is_file():
+            raise ConfigurationError(f"Asset type definitions file not found: {ASSET_TYPE_DEFINITIONS_PATH}")
+        try:
+            with open(ASSET_TYPE_DEFINITIONS_PATH, 'r', encoding='utf-8') as f:
+                data = json.load(f)
+            if "ASSET_TYPE_DEFINITIONS" not in data:
+                raise ConfigurationError(f"Key 'ASSET_TYPE_DEFINITIONS' not found in {ASSET_TYPE_DEFINITIONS_PATH}")
+            settings = data["ASSET_TYPE_DEFINITIONS"]
+            if not isinstance(settings, dict):
+                raise ConfigurationError(f"'ASSET_TYPE_DEFINITIONS' in {ASSET_TYPE_DEFINITIONS_PATH} must be a dictionary.")
+            log.debug(f"Asset type definitions loaded successfully.")
+            return settings
+        except json.JSONDecodeError as e:
+            raise ConfigurationError(f"Failed to parse asset type definitions file {ASSET_TYPE_DEFINITIONS_PATH}: Invalid JSON - {e}")
+        except Exception as e:
+            raise ConfigurationError(f"Failed to read asset type definitions file {ASSET_TYPE_DEFINITIONS_PATH}: {e}")
+
+    def _load_file_type_definitions(self) -> dict:
+        """Loads file type definitions from the file_type_definitions.json file."""
+        log.debug(f"Loading file type definitions from: {FILE_TYPE_DEFINITIONS_PATH}")
+        if not FILE_TYPE_DEFINITIONS_PATH.is_file():
+            raise ConfigurationError(f"File type definitions file not found: {FILE_TYPE_DEFINITIONS_PATH}")
+        try:
+            with open(FILE_TYPE_DEFINITIONS_PATH, 'r', encoding='utf-8') as f:
+                data = json.load(f)
+            if "FILE_TYPE_DEFINITIONS" not in data:
+                raise ConfigurationError(f"Key 'FILE_TYPE_DEFINITIONS' not found in {FILE_TYPE_DEFINITIONS_PATH}")
+            settings = data["FILE_TYPE_DEFINITIONS"]
+            if not isinstance(settings, dict):
+                raise ConfigurationError(f"'FILE_TYPE_DEFINITIONS' in {FILE_TYPE_DEFINITIONS_PATH} must be a dictionary.")
+            log.debug(f"File type definitions loaded successfully.")
+            return settings
+        except json.JSONDecodeError as e:
+            raise ConfigurationError(f"Failed to parse file type definitions file {FILE_TYPE_DEFINITIONS_PATH}: Invalid JSON - {e}")
+        except Exception as e:
+            raise ConfigurationError(f"Failed to read file type definitions file {FILE_TYPE_DEFINITIONS_PATH}: {e}")
+
+    def _load_user_settings(self) -> dict:
+        """Loads user override settings from config/user_settings.json."""
+        log.debug(f"Attempting to load user settings from: {USER_SETTINGS_PATH}")
+        if not USER_SETTINGS_PATH.is_file():
+            log.info(f"User settings file not found: {USER_SETTINGS_PATH}. Proceeding without user overrides.")
+            return {}
+        try:
+            with open(USER_SETTINGS_PATH, 'r', encoding='utf-8') as f:
+                settings = json.load(f)
+            log.info(f"User settings loaded successfully from {USER_SETTINGS_PATH}.")
+            return settings
+        except json.JSONDecodeError as e:
+            log.warning(f"Failed to parse user settings file {USER_SETTINGS_PATH}: Invalid JSON - {e}. Using empty user settings.")
+            return {}
+        except Exception as e:
+            log.warning(f"Failed to read user settings file {USER_SETTINGS_PATH}: {e}. Using empty user settings.")
+            return {}
+
     def _validate_configs(self):
         """Performs basic validation checks on loaded settings."""
         log.debug("Validating loaded configurations...")
+
+        # Validate new definition files first
+        if not isinstance(self._asset_type_definitions, dict):
+            raise ConfigurationError("Asset type definitions were not loaded correctly or are not a dictionary.")
+        if not self._asset_type_definitions: # Check if empty
+             raise ConfigurationError("Asset type definitions are empty.")
+
+        if not isinstance(self._file_type_definitions, dict):
+            raise ConfigurationError("File type definitions were not loaded correctly or are not a dictionary.")
+        if not self._file_type_definitions: # Check if empty
+            raise ConfigurationError("File type definitions are empty.")
+
         # Preset validation
         required_preset_keys = [
             "preset_name", "supplier_name", "source_naming", "map_type_mapping",
@@ -236,7 +353,7 @@ class Configuration:
              if 'target_type' not in rule or not isinstance(rule['target_type'], str):
                   raise ConfigurationError(f"Preset '{self.preset_name}': Rule at index {index} in 'map_type_mapping' is missing 'target_type' string.")
  
-             valid_file_type_keys = self._core_settings.get('FILE_TYPE_DEFINITIONS', {}).keys()
+             valid_file_type_keys = self._file_type_definitions.keys()
              if rule['target_type'] not in valid_file_type_keys:
                  raise ConfigurationError(
                      f"Preset '{self.preset_name}': Rule at index {index} in 'map_type_mapping' "
@@ -261,7 +378,7 @@ class Configuration:
              raise ConfigurationError("Core config 'IMAGE_RESOLUTIONS' must be a dictionary.")
 
         # Validate DEFAULT_ASSET_CATEGORY
-        valid_asset_type_keys = self._core_settings.get('ASSET_TYPE_DEFINITIONS', {}).keys()
+        valid_asset_type_keys = self._asset_type_definitions.keys()
         default_asset_category_value = self._core_settings.get('DEFAULT_ASSET_CATEGORY')
         if not default_asset_category_value:
             raise ConfigurationError("Core config 'DEFAULT_ASSET_CATEGORY' is missing.")
@@ -423,11 +540,11 @@ class Configuration:
         Gets the bit depth rule ('respect', 'force_8bit', 'force_16bit') for a given map type identifier.
         The map_type_input can be an FTD key (e.g., "MAP_COL") or a suffixed FTD key (e.g., "MAP_COL-1").
         """
-        if not self._core_settings or 'FILE_TYPE_DEFINITIONS' not in self._core_settings:
-            log.warning("FILE_TYPE_DEFINITIONS not found in core settings. Cannot determine bit depth rule.")
+        if not self._file_type_definitions: # Check if the attribute exists and is not empty
+            log.warning("File type definitions not loaded. Cannot determine bit depth rule.")
             return "respect"
 
-        file_type_definitions = self._core_settings['FILE_TYPE_DEFINITIONS']
+        file_type_definitions = self._file_type_definitions
         
         # 1. Try direct match with map_type_input as FTD key
         definition = file_type_definitions.get(map_type_input)
@@ -473,8 +590,8 @@ class Configuration:
         from FILE_TYPE_DEFINITIONS.
         """
         aliases = set()
-        file_type_definitions = self._core_settings.get('FILE_TYPE_DEFINITIONS', {})
-        for _key, definition in file_type_definitions.items():
+        # _file_type_definitions is guaranteed to be a dict by the loader
+        for _key, definition in self._file_type_definitions.items():
             if isinstance(definition, dict):
                 standard_type = definition.get('standard_type')
                 if standard_type and isinstance(standard_type, str) and standard_type.strip():
@@ -482,16 +599,16 @@ class Configuration:
         return sorted(list(aliases))
  
     def get_asset_type_definitions(self) -> dict:
-        """Returns the ASSET_TYPE_DEFINITIONS dictionary from core settings."""
-        return self._core_settings.get('ASSET_TYPE_DEFINITIONS', {})
+        """Returns the _asset_type_definitions dictionary."""
+        return self._asset_type_definitions
 
     def get_asset_type_keys(self) -> list:
         """Returns a list of valid asset type keys from core settings."""
         return list(self.get_asset_type_definitions().keys())
 
     def get_file_type_definitions_with_examples(self) -> dict:
-        """Returns the FILE_TYPE_DEFINITIONS dictionary (including descriptions and examples) from core settings."""
-        return self._core_settings.get('FILE_TYPE_DEFINITIONS', {})
+        """Returns the _file_type_definitions dictionary (including descriptions and examples)."""
+        return self._file_type_definitions
 
     def get_file_type_keys(self) -> list:
         """Returns a list of valid file type keys from core settings."""
@@ -534,7 +651,7 @@ class Configuration:
 
     @property
     def FILE_TYPE_DEFINITIONS(self) -> dict:
-        return self._core_settings.get('FILE_TYPE_DEFINITIONS', {})
+        return self._file_type_definitions
 
     @property
     def keybind_config(self) -> dict[str, list[str]]:
@@ -544,8 +661,8 @@ class Configuration:
         Example: {'C': ['MAP_COL'], 'R': ['MAP_ROUGH', 'MAP_GLOSS']}
         """
         keybinds = {}
-        file_type_defs = self._core_settings.get('FILE_TYPE_DEFINITIONS', {})
-        for ftd_key, ftd_value in file_type_defs.items():
+        # _file_type_definitions is guaranteed to be a dict by the loader
+        for ftd_key, ftd_value in self._file_type_definitions.items():
             if isinstance(ftd_value, dict) and 'keybind' in ftd_value:
                 key = ftd_value['keybind']
                 if key not in keybinds:
@@ -561,25 +678,92 @@ class Configuration:
 
 def load_base_config() -> dict:
     """
-    Loads only the base configuration from app_settings.json.
-    Does not load presets or perform merging/validation.
+    Loads base configuration by merging app_settings.json, user_settings.json (if exists),
+    asset_type_definitions.json, and file_type_definitions.json.
+    Does not load presets or perform full validation beyond basic file loading.
+    Returns a dictionary containing the merged settings. If app_settings.json
+    fails to load, an empty dictionary is returned. If other files
+    fail, errors are logged, and the function proceeds with what has been loaded.
     """
+    base_settings = {}
+
+    # 1. Load app_settings.json (critical)
     if not APP_SETTINGS_PATH.is_file():
-        log.error(f"Base configuration file not found: {APP_SETTINGS_PATH}")
-        # Return empty dict or raise a specific error if preferred
-        # For now, return empty dict to allow GUI to potentially start with defaults
+        log.error(f"Critical: Base application settings file not found: {APP_SETTINGS_PATH}. Returning empty configuration.")
         return {}
     try:
         with open(APP_SETTINGS_PATH, 'r', encoding='utf-8') as f:
-            settings = json.load(f)
-        return settings
+            base_settings = json.load(f)
+        log.info(f"Successfully loaded base application settings from: {APP_SETTINGS_PATH}")
     except json.JSONDecodeError as e:
-        log.error(f"Failed to parse base configuration file {APP_SETTINGS_PATH}: Invalid JSON - {e}")
+        log.error(f"Critical: Failed to parse base application settings file {APP_SETTINGS_PATH}: Invalid JSON - {e}. Returning empty configuration.")
         return {}
     except Exception as e:
-        log.error(f"Failed to read base configuration file {APP_SETTINGS_PATH}: {e}")
+        log.error(f"Critical: Failed to read base application settings file {APP_SETTINGS_PATH}: {e}. Returning empty configuration.")
         return {}
 
+    # 2. Attempt to load user_settings.json
+    user_settings_overrides = {}
+    if USER_SETTINGS_PATH.is_file():
+        try:
+            with open(USER_SETTINGS_PATH, 'r', encoding='utf-8') as f:
+                user_settings_overrides = json.load(f)
+            log.info(f"User settings loaded successfully for base_config from {USER_SETTINGS_PATH}.")
+        except json.JSONDecodeError as e:
+            log.warning(f"Failed to parse user settings file {USER_SETTINGS_PATH} for base_config: Invalid JSON - {e}. Proceeding without these user overrides.")
+        except Exception as e:
+            log.warning(f"Failed to read user settings file {USER_SETTINGS_PATH} for base_config: {e}. Proceeding without these user overrides.")
+    
+    # 3. Deep merge user settings onto base_settings
+    if user_settings_overrides:
+        log.info("Applying user setting overrides to base_settings in load_base_config.")
+        # _deep_merge_dicts modifies base_settings in place
+        _deep_merge_dicts(base_settings, user_settings_overrides)
+
+    # 4. Load asset_type_definitions.json (non-critical, merge if successful)
+    if not ASSET_TYPE_DEFINITIONS_PATH.is_file():
+        log.error(f"Asset type definitions file not found: {ASSET_TYPE_DEFINITIONS_PATH}. Proceeding without it.")
+    else:
+        try:
+            with open(ASSET_TYPE_DEFINITIONS_PATH, 'r', encoding='utf-8') as f:
+                asset_defs_data = json.load(f)
+            if "ASSET_TYPE_DEFINITIONS" in asset_defs_data:
+                if isinstance(asset_defs_data["ASSET_TYPE_DEFINITIONS"], dict):
+                    # Merge into base_settings, which might already contain user overrides
+                    base_settings['ASSET_TYPE_DEFINITIONS'] = asset_defs_data["ASSET_TYPE_DEFINITIONS"]
+                    log.info(f"Successfully loaded and merged ASSET_TYPE_DEFINITIONS from: {ASSET_TYPE_DEFINITIONS_PATH}")
+                else:
+                    log.error(f"Value under 'ASSET_TYPE_DEFINITIONS' in {ASSET_TYPE_DEFINITIONS_PATH} is not a dictionary. Skipping merge.")
+            else:
+                log.error(f"Key 'ASSET_TYPE_DEFINITIONS' not found in {ASSET_TYPE_DEFINITIONS_PATH}. Skipping merge.")
+        except json.JSONDecodeError as e:
+            log.error(f"Failed to parse asset type definitions file {ASSET_TYPE_DEFINITIONS_PATH}: Invalid JSON - {e}. Skipping merge.")
+        except Exception as e:
+            log.error(f"Failed to read asset type definitions file {ASSET_TYPE_DEFINITIONS_PATH}: {e}. Skipping merge.")
+
+    # 5. Load file_type_definitions.json (non-critical, merge if successful)
+    if not FILE_TYPE_DEFINITIONS_PATH.is_file():
+        log.error(f"File type definitions file not found: {FILE_TYPE_DEFINITIONS_PATH}. Proceeding without it.")
+    else:
+        try:
+            with open(FILE_TYPE_DEFINITIONS_PATH, 'r', encoding='utf-8') as f:
+                file_defs_data = json.load(f)
+            if "FILE_TYPE_DEFINITIONS" in file_defs_data:
+                if isinstance(file_defs_data["FILE_TYPE_DEFINITIONS"], dict):
+                     # Merge into base_settings
+                    base_settings['FILE_TYPE_DEFINITIONS'] = file_defs_data["FILE_TYPE_DEFINITIONS"]
+                    log.info(f"Successfully loaded and merged FILE_TYPE_DEFINITIONS from: {FILE_TYPE_DEFINITIONS_PATH}")
+                else:
+                    log.error(f"Value under 'FILE_TYPE_DEFINITIONS' in {FILE_TYPE_DEFINITIONS_PATH} is not a dictionary. Skipping merge.")
+            else:
+                log.error(f"Key 'FILE_TYPE_DEFINITIONS' not found in {FILE_TYPE_DEFINITIONS_PATH}. Skipping merge.")
+        except json.JSONDecodeError as e:
+            log.error(f"Failed to parse file type definitions file {FILE_TYPE_DEFINITIONS_PATH}: Invalid JSON - {e}. Skipping merge.")
+        except Exception as e:
+            log.error(f"Failed to read file type definitions file {FILE_TYPE_DEFINITIONS_PATH}: {e}. Skipping merge.")
+
+    return base_settings
+
 def save_llm_config(settings_dict: dict):
     """
     Saves the provided LLM settings dictionary to llm_settings.json.
@@ -594,6 +778,18 @@ def save_llm_config(settings_dict: dict):
         log.error(f"Failed to save LLM configuration file {LLM_SETTINGS_PATH}: {e}")
         # Re-raise as ConfigurationError to signal failure upstream
         raise ConfigurationError(f"Failed to save LLM configuration: {e}")
+def save_user_config(settings_dict: dict):
+    """Saves the provided settings dictionary to user_settings.json."""
+    log.debug(f"Saving user config to: {USER_SETTINGS_PATH}")
+    try:
+        # Ensure parent directory exists (though 'config/' should always exist)
+        USER_SETTINGS_PATH.parent.mkdir(parents=True, exist_ok=True)
+        with open(USER_SETTINGS_PATH, 'w', encoding='utf-8') as f:
+            json.dump(settings_dict, f, indent=4)
+        log.info(f"User config saved successfully to {USER_SETTINGS_PATH}")
+    except Exception as e:
+        log.error(f"Failed to save user configuration file {USER_SETTINGS_PATH}: {e}")
+        raise ConfigurationError(f"Failed to save user configuration: {e}")
 def save_base_config(settings_dict: dict):
     """
     Saves the provided settings dictionary to app_settings.json.
@@ -606,3 +802,149 @@ def save_base_config(settings_dict: dict):
     except Exception as e:
         log.error(f"Failed to save base configuration file {APP_SETTINGS_PATH}: {e}")
         raise ConfigurationError(f"Failed to save configuration: {e}")
+
+def load_asset_definitions() -> dict:
+    """
+    Reads config/asset_type_definitions.json.
+    Returns the dictionary under the "ASSET_TYPE_DEFINITIONS" key.
+    Handles file not found or JSON errors gracefully (e.g., return empty dict, log error).
+    """
+    log.debug(f"Loading asset type definitions from: {ASSET_TYPE_DEFINITIONS_PATH}")
+    if not ASSET_TYPE_DEFINITIONS_PATH.is_file():
+        log.error(f"Asset type definitions file not found: {ASSET_TYPE_DEFINITIONS_PATH}")
+        return {}
+    try:
+        with open(ASSET_TYPE_DEFINITIONS_PATH, 'r', encoding='utf-8') as f:
+            data = json.load(f)
+        if "ASSET_TYPE_DEFINITIONS" not in data:
+            log.error(f"Key 'ASSET_TYPE_DEFINITIONS' not found in {ASSET_TYPE_DEFINITIONS_PATH}")
+            return {}
+        settings = data["ASSET_TYPE_DEFINITIONS"]
+        if not isinstance(settings, dict):
+            log.error(f"'ASSET_TYPE_DEFINITIONS' in {ASSET_TYPE_DEFINITIONS_PATH} must be a dictionary.")
+            return {}
+        log.debug(f"Asset type definitions loaded successfully.")
+        return settings
+    except json.JSONDecodeError as e:
+        log.error(f"Failed to parse asset type definitions file {ASSET_TYPE_DEFINITIONS_PATH}: Invalid JSON - {e}")
+        return {}
+    except Exception as e:
+        log.error(f"Failed to read asset type definitions file {ASSET_TYPE_DEFINITIONS_PATH}: {e}")
+        return {}
+
+def save_asset_definitions(data: dict):
+    """
+    Takes a dictionary (representing the content for the "ASSET_TYPE_DEFINITIONS" key).
+    Writes it to config/asset_type_definitions.json under the root key "ASSET_TYPE_DEFINITIONS".
+    Handles potential I/O errors.
+    """
+    log.debug(f"Saving asset type definitions to: {ASSET_TYPE_DEFINITIONS_PATH}")
+    try:
+        with open(ASSET_TYPE_DEFINITIONS_PATH, 'w', encoding='utf-8') as f:
+            json.dump({"ASSET_TYPE_DEFINITIONS": data}, f, indent=4)
+        log.info(f"Asset type definitions saved successfully to {ASSET_TYPE_DEFINITIONS_PATH}")
+    except Exception as e:
+        log.error(f"Failed to save asset type definitions file {ASSET_TYPE_DEFINITIONS_PATH}: {e}")
+        raise ConfigurationError(f"Failed to save asset type definitions: {e}")
+
+def load_file_type_definitions() -> dict:
+    """
+    Reads config/file_type_definitions.json.
+    Returns the dictionary under the "FILE_TYPE_DEFINITIONS" key.
+    Handles errors gracefully.
+    """
+    log.debug(f"Loading file type definitions from: {FILE_TYPE_DEFINITIONS_PATH}")
+    if not FILE_TYPE_DEFINITIONS_PATH.is_file():
+        log.error(f"File type definitions file not found: {FILE_TYPE_DEFINITIONS_PATH}")
+        return {}
+    try:
+        with open(FILE_TYPE_DEFINITIONS_PATH, 'r', encoding='utf-8') as f:
+            data = json.load(f)
+        if "FILE_TYPE_DEFINITIONS" not in data:
+            log.error(f"Key 'FILE_TYPE_DEFINITIONS' not found in {FILE_TYPE_DEFINITIONS_PATH}")
+            return {}
+        settings = data["FILE_TYPE_DEFINITIONS"]
+        if not isinstance(settings, dict):
+            log.error(f"'FILE_TYPE_DEFINITIONS' in {FILE_TYPE_DEFINITIONS_PATH} must be a dictionary.")
+            return {}
+        log.debug(f"File type definitions loaded successfully.")
+        return settings
+    except json.JSONDecodeError as e:
+        log.error(f"Failed to parse file type definitions file {FILE_TYPE_DEFINITIONS_PATH}: Invalid JSON - {e}")
+        return {}
+    except Exception as e:
+        log.error(f"Failed to read file type definitions file {FILE_TYPE_DEFINITIONS_PATH}: {e}")
+        return {}
+
+def save_file_type_definitions(data: dict):
+    """
+    Takes a dictionary (representing content for "FILE_TYPE_DEFINITIONS" key).
+    Writes it to config/file_type_definitions.json under the root key "FILE_TYPE_DEFINITIONS".
+    Handles errors.
+    """
+    log.debug(f"Saving file type definitions to: {FILE_TYPE_DEFINITIONS_PATH}")
+    try:
+        with open(FILE_TYPE_DEFINITIONS_PATH, 'w', encoding='utf-8') as f:
+            json.dump({"FILE_TYPE_DEFINITIONS": data}, f, indent=4)
+        log.info(f"File type definitions saved successfully to {FILE_TYPE_DEFINITIONS_PATH}")
+    except Exception as e:
+        log.error(f"Failed to save file type definitions file {FILE_TYPE_DEFINITIONS_PATH}: {e}")
+        raise ConfigurationError(f"Failed to save file type definitions: {e}")
+
+def load_supplier_settings() -> dict:
+    """
+    Reads config/suppliers.json.
+    Returns the entire dictionary.
+    Handles file not found (return empty dict) or JSON errors.
+    If the loaded data is a list (old format), convert it in memory to the new
+    dictionary format, defaulting normal_map_type to "OpenGL" for each supplier.
+    """
+    log.debug(f"Loading supplier settings from: {SUPPLIERS_CONFIG_PATH}")
+    if not SUPPLIERS_CONFIG_PATH.is_file():
+        log.warning(f"Supplier settings file not found: {SUPPLIERS_CONFIG_PATH}. Returning empty dict.")
+        return {}
+    try:
+        with open(SUPPLIERS_CONFIG_PATH, 'r', encoding='utf-8') as f:
+            data = json.load(f)
+        
+        if isinstance(data, list):
+            log.warning(f"Supplier settings in {SUPPLIERS_CONFIG_PATH} is in the old list format. Converting to new dictionary format.")
+            new_data = {}
+            for supplier_name in data:
+                if isinstance(supplier_name, str):
+                    new_data[supplier_name] = {"normal_map_type": "OpenGL"}
+                else:
+                    log.warning(f"Skipping non-string item '{supplier_name}' during old format conversion of supplier settings.")
+            log.info(f"Supplier settings converted to new format: {new_data}")
+            return new_data
+        
+        if not isinstance(data, dict):
+            log.error(f"Supplier settings in {SUPPLIERS_CONFIG_PATH} must be a dictionary. Found {type(data)}. Returning empty dict.")
+            return {}
+            
+        log.debug(f"Supplier settings loaded successfully.")
+        return data
+    except json.JSONDecodeError as e:
+        log.error(f"Failed to parse supplier settings file {SUPPLIERS_CONFIG_PATH}: Invalid JSON - {e}. Returning empty dict.")
+        return {}
+    except Exception as e:
+        log.error(f"Failed to read supplier settings file {SUPPLIERS_CONFIG_PATH}: {e}. Returning empty dict.")
+        return {}
+
+def save_supplier_settings(data: dict):
+    """
+    Takes a dictionary (in the new format).
+    Writes it directly to config/suppliers.json.
+    Handles errors.
+    """
+    log.debug(f"Saving supplier settings to: {SUPPLIERS_CONFIG_PATH}")
+    if not isinstance(data, dict):
+        log.error(f"Data for save_supplier_settings must be a dictionary. Got {type(data)}.")
+        raise ConfigurationError(f"Invalid data type for saving supplier settings: {type(data)}")
+    try:
+        with open(SUPPLIERS_CONFIG_PATH, 'w', encoding='utf-8') as f:
+            json.dump(data, f, indent=2) # Using indent=2 as per the example for suppliers.json
+        log.info(f"Supplier settings saved successfully to {SUPPLIERS_CONFIG_PATH}")
+    except Exception as e:
+        log.error(f"Failed to save supplier settings file {SUPPLIERS_CONFIG_PATH}: {e}")
+        raise ConfigurationError(f"Failed to save supplier settings: {e}")

documentation/definitions_editor_plan.md

@@ -0,0 +1,137 @@
+# Plan for New Definitions Editor UI
+
+## 1. Overview
+
+This document outlines the plan to create a new, dedicated UI for managing "Asset Type Definitions", "File Type Definitions", and "Supplier Settings". This editor will provide a more structured and user-friendly way to manage these core application configurations, which are currently stored in separate JSON files.
+
+## 2. General Design Principles
+
+*   **Dedicated Dialog:** The editor will be a new `QDialog` (e.g., `DefinitionsEditorDialog`).
+*   **Access Point:** Launched from the `MainWindow` menu bar (e.g., under a "Definitions" menu or "Edit" -> "Edit Definitions...").
+*   **Tabbed Interface:** The dialog will use a `QTabWidget` to separate the management of different definition types.
+*   **List/Details View:** Each tab will generally follow a two-pane layout:
+    *   **Left Pane:** A `QListWidget` displaying the primary keys or names of the definitions (e.g., asset type names, file type IDs, supplier names). Includes "Add" and "Remove" buttons for managing these primary entries.
+    *   **Right Pane:** A details area (e.g., `QGroupBox` with a `QFormLayout`) that shows the specific settings for the item selected in the left-pane list.
+*   **Data Persistence:** The dialog will load from and save to the respective JSON configuration files:
+    *   Asset Types: `config/asset_type_definitions.json`
+    *   File Types: `config/file_type_definitions.json`
+    *   Supplier Settings: `config/suppliers.json` (This file will be refactored from a simple list to a dictionary of supplier objects).
+*   **User Experience:** Standard "Save" and "Cancel" buttons, with a check for unsaved changes.
+
+## 3. Tab-Specific Plans
+
+### 3.1. Asset Type Definitions Tab
+
+*   **Manages:** `config/asset_type_definitions.json`
+*   **UI Sketch:**
+    ```mermaid
+    graph LR
+        subgraph AssetTypeTab [Asset Type Definitions Tab]
+            direction LR
+            AssetList[QListWidget (Asset Type Keys e.g., "Surface")] --> AssetDetailsGroup{Details for Selected Asset Type};
+        end
+
+        subgraph AssetDetailsGroup
+            direction TB
+            Desc[Description: QTextEdit]
+            Color[Color: QPushButton ("Choose Color...") + Color Swatch Display]
+            Examples[Examples: QListWidget + Add/Remove Example Buttons]
+        end
+        AssetActions["Add Asset Type (Prompt for Name)\nRemove Selected Asset Type"] --> AssetList
+    ```
+*   **Details:**
+    *   **Left Pane:** `QListWidget` for asset type names. "Add Asset Type" (prompts for new key) and "Remove Selected Asset Type" buttons.
+    *   **Right Pane (Details):**
+        *   `description`: `QTextEdit`.
+        *   `color`: `QPushButton` opening `QColorDialog`, with an adjacent `QLabel` to display the color swatch.
+        *   `examples`: `QListWidget` with "Add Example" (`QInputDialog.getText`) and "Remove Selected Example" buttons.
+
+### 3.2. File Type Definitions Tab
+
+*   **Manages:** `config/file_type_definitions.json`
+*   **UI Sketch:**
+    ```mermaid
+    graph LR
+        subgraph FileTypeTab [File Type Definitions Tab]
+            direction LR
+            FileList[QListWidget (File Type Keys e.g., "MAP_COL")] --> FileDetailsGroup{Details for Selected File Type};
+        end
+
+        subgraph FileDetailsGroup
+            direction TB
+            DescF[Description: QTextEdit]
+            ColorF[Color: QPushButton ("Choose Color...") + Color Swatch Display]
+            ExamplesF[Examples: QListWidget + Add/Remove Example Buttons]
+            StdType[Standard Type: QLineEdit]
+            BitDepth[Bit Depth Rule: QComboBox ("respect", "force_8bit", "force_16bit")]
+            IsGrayscale[Is Grayscale: QCheckBox]
+            Keybind[Keybind: QLineEdit (1 char)]
+        end
+        FileActions["Add File Type (Prompt for ID)\nRemove Selected File Type"] --> FileList
+    ```
+*   **Details:**
+    *   **Left Pane:** `QListWidget` for file type IDs. "Add File Type" (prompts for new key) and "Remove Selected File Type" buttons.
+    *   **Right Pane (Details):**
+        *   `description`: `QTextEdit`.
+        *   `color`: `QPushButton` opening `QColorDialog`, with an adjacent `QLabel` for color swatch.
+        *   `examples`: `QListWidget` with "Add Example" and "Remove Selected Example" buttons.
+        *   `standard_type`: `QLineEdit`.
+        *   `bit_depth_rule`: `QComboBox` (options: "respect", "force_8bit", "force_16bit").
+        *   `is_grayscale`: `QCheckBox`.
+        *   `keybind`: `QLineEdit` (validation for single character recommended).
+
+### 3.3. Supplier Settings Tab
+
+*   **Manages:** `config/suppliers.json` (This file will be refactored to a dictionary structure, e.g., `{"SupplierName": {"normal_map_type": "OpenGL", ...}}`).
+*   **UI Sketch:**
+    ```mermaid
+    graph LR
+        subgraph SupplierTab [Supplier Settings Tab]
+            direction LR
+            SupplierList[QListWidget (Supplier Names)] --> SupplierDetailsGroup{Details for Selected Supplier};
+        end
+
+        subgraph SupplierDetailsGroup
+            direction TB
+            NormalMapType[Normal Map Type: QComboBox ("OpenGL", "DirectX")]
+            %% Future supplier-specific settings can be added here
+        end
+        SupplierActions["Add Supplier (Prompt for Name)\nRemove Selected Supplier"] --> SupplierList
+    ```
+*   **Details:**
+    *   **Left Pane:** `QListWidget` for supplier names. "Add Supplier" (prompts for new name) and "Remove Selected Supplier" buttons.
+    *   **Right Pane (Details):**
+        *   `normal_map_type`: `QComboBox` (options: "OpenGL", "DirectX"). Default for new suppliers: "OpenGL".
+        *   *(Space for future supplier-specific settings).*
+*   **Data Handling Note for `config/suppliers.json`:**
+    *   The editor will load from and save to `config/suppliers.json` using the new dictionary format (supplier name as key, object of settings as value).
+    *   Initial implementation might require `config/suppliers.json` to be manually updated to this new format if it currently exists as a simple list. Alternatively, the editor could attempt an automatic conversion on first load if the old list format is detected, or prompt the user. For the first pass, assuming the editor works with the new format is simpler.
+
+## 4. Implementation Steps (High-Level)
+
+1.  **(Potentially Manual First Step) Refactor `config/suppliers.json`:** If `config/suppliers.json` exists as a list, manually convert it to the new dictionary structure (e.g., `{"SupplierName": {"normal_map_type": "OpenGL"}}`) before starting UI development for this tab, or plan for the editor to handle this conversion.
+2.  **Create `DefinitionsEditorDialog` Class:** Inherit from `QDialog`.
+3.  **Implement UI Structure:** Main `QTabWidget`, and for each tab, the two-pane layout with `QListWidget`, `QGroupBox` for details, and relevant input widgets (`QLineEdit`, `QTextEdit`, `QComboBox`, `QCheckBox`, `QPushButton`).
+4.  **Implement Loading Logic:**
+    *   For each tab, read data from its corresponding JSON file.
+    *   Populate the left-pane `QListWidget` with the primary keys/names.
+    *   Store the full data structure internally (e.g., in dictionaries within the dialog instance).
+5.  **Implement Display Logic:**
+    *   When an item is selected in a `QListWidget`, populate the right-pane detail fields with the data for that item.
+6.  **Implement Editing Logic:**
+    *   Ensure that changes made in the detail fields (text edits, combobox selections, checkbox states, color choices, list example modifications) update the corresponding internal data structure for the currently selected item.
+7.  **Implement Add/Remove Functionality:**
+    *   For each definition type (Asset Type, File Type, Supplier), implement the "Add" and "Remove" buttons.
+        *   "Add": Prompt for a unique key/name, create a new default entry in the internal data, and add it to the `QListWidget`.
+        *   "Remove": Remove the selected item from the `QListWidget` and the internal data.
+    *   For "examples" lists within Asset and File types, implement their "Add Example" and "Remove Selected Example" buttons.
+8.  **Implement Saving Logic:**
+    *   When the main "Save" button is clicked:
+        *   Write the (potentially modified) Asset Type definitions data structure to `config/asset_type_definitions.json`.
+        *   Write File Type definitions to `config/file_type_definitions.json`.
+        *   Write Supplier settings (in the new dictionary format) to `config/suppliers.json`.
+    *   Consider creating new dedicated save functions in `configuration.py` for each of these files if they don't already exist or if existing ones are not suitable.
+9.  **Implement Unsaved Changes Check & Cancel Logic.**
+10. **Integrate Dialog Launch:** Add a menu action in `MainWindow.py` to open the `DefinitionsEditorDialog`.
+
+This plan provides a comprehensive approach to creating a dedicated editor for these crucial application definitions.

documentation/preferences_refactor_plan.md

@@ -0,0 +1,113 @@
+# Refactoring Plan for Preferences Window (ConfigEditorDialog)
+
+## 1. Overview
+
+This document outlines the plan to refactor the preferences window (`gui/config_editor_dialog.py`). The primary goal is to address issues related to misaligned scope, poor user experience for certain data types, and incomplete interactivity. The refactoring will focus on making the `ConfigEditorDialog` a robust editor for settings in `config/app_settings.json` that are intended to be overridden by the user via `config/user_settings.json`.
+
+## 2. Assessment Summary
+
+*   **Misaligned Scope:** The dialog currently includes UI for "Asset Type Definitions" and "File Type Definitions". However, these are managed in separate dedicated JSON files ([`config/asset_type_definitions.json`](config/asset_type_definitions.json) and [`config/file_type_definitions.json`](config/file_type_definitions.json)) and are not saved by this dialog (which targets `config/user_settings.json`).
+*   **Poor UX for Data Types:**
+    *   Lists (e.g., `RESPECT_VARIANT_MAP_TYPES`) are edited as comma-separated strings.
+    *   Dictionary-like structures (e.g., `IMAGE_RESOLUTIONS`) are handled inconsistently (JSON defines as dict, UI attempts list-of-pairs).
+    *   Editing complex list-of-objects (e.g., `MAP_MERGE_RULES`) is functionally incomplete.
+*   **Incomplete Interactivity:** Many table-based editors lack "Add/Remove Row" functionality and proper cell delegates for intuitive editing.
+*   **LLM Settings:** Confirmed to be correctly managed by the separate `LLMEditorWidget` and `config/llm_settings.json`, so they are out of scope for this specific dialog refactor.
+
+## 3. Refactoring Phases and Plan Details
+
+```mermaid
+graph TD
+    A[Start: Current State] --> B{Phase 1: Correct Scope & Critical UX/Data Fixes};
+    B --> C{Phase 2: Enhance MAP_MERGE_RULES Editor};
+    C --> D{Phase 3: General UX & Table Interactivity};
+    D --> E[End: Refactored Preferences Window];
+
+    subgraph "Phase 1: Correct Scope & Critical UX/Data Fixes"
+        B1[Remove Definitions Editing from ConfigEditorDialog]
+        B2[Improve List Editing for RESPECT_VARIANT_MAP_TYPES]
+        B3[Fix IMAGE_RESOLUTIONS Handling (Dictionary)]
+        B4[Handle Simple Nested Settings (e.g., general_settings)]
+    end
+
+    subgraph "Phase 2: Enhance MAP_MERGE_RULES Editor"
+        C1[Implement Add/Remove for Merge Rules]
+        C2[Improve Rule Detail Editing (ComboBoxes, SpinBoxes)]
+    end
+
+    subgraph "Phase 3: General UX & Table Interactivity"
+        D1[Implement IMAGE_RESOLUTIONS Table Add/Remove Buttons]
+        D2[Implement Necessary Table Cell Delegates (e.g., for IMAGE_RESOLUTIONS values)]
+        D3[Review/Refine Tab Layout & Widget Grouping]
+    end
+
+    B --> B1; B --> B2; B --> B3; B --> B4;
+    C --> C1; C --> C2;
+    D --> D1; D --> D2; D --> D3;
+```
+
+### Phase 1: Correct Scope & Critical UX/Data Fixes (in `gui/config_editor_dialog.py`)
+
+1.  **Remove Definitions Editing:**
+    *   **Action:** In `populate_definitions_tab`, remove the inner `QTabWidget` and the code that creates/populates the "Asset Types" and "File Types" tables.
+    *   The `DEFAULT_ASSET_CATEGORY` `QComboBox` (for the setting from `app_settings.json`) should remain. Its items should be populated using keys obtained from the `Configuration` class (which loads the actual `ASSET_TYPE_DEFINITIONS` from its dedicated file).
+    *   **Rationale:** Simplifies the dialog to settings managed via `user_settings.json`. Editing of the full definition files requires dedicated UI (see Future Enhancements note).
+
+2.  **Improve `RESPECT_VARIANT_MAP_TYPES` Editing:**
+    *   **Action:** In `populate_output_naming_tab`, replace the `QLineEdit` for `RESPECT_VARIANT_MAP_TYPES` with a `QListWidget` and "Add"/"Remove" buttons.
+    *   "Add" button: Use `QInputDialog.getItem` with items populated from `Configuration.get_file_type_keys()` (or similar method accessing loaded `FILE_TYPE_DEFINITIONS`) to allow users to select a valid file type key.
+    *   "Remove" button: Remove the selected item from the `QListWidget`.
+    *   Update `save_settings` to read the list of strings from this `QListWidget`.
+    *   Update `populate_widgets_from_settings` to populate this `QListWidget`.
+
+3.  **Fix `IMAGE_RESOLUTIONS` Handling:**
+    *   **Action:** In `populate_image_processing_tab`:
+        *   The `QTableWidget` for `IMAGE_RESOLUTIONS` should have two columns: "Name" (string, for the dictionary key) and "Resolution (px)" (integer, for the dictionary value).
+        *   In `populate_image_resolutions_table`, ensure it correctly populates from the dictionary structure in `self.settings['IMAGE_RESOLUTIONS']` (from `app_settings.json`).
+        *   In `save_settings`, ensure it correctly reads data from the table and reconstructs the `IMAGE_RESOLUTIONS` dictionary (e.g., `{"4K": 4096, "2K": 2048}`) when saving to `user_settings.json`.
+    *   ComboBoxes `CALCULATE_STATS_RESOLUTION` and `RESOLUTION_THRESHOLD_FOR_JPG` should be populated with the *keys* (names like "4K", "2K") from the `IMAGE_RESOLUTIONS` dictionary. `RESOLUTION_THRESHOLD_FOR_JPG` should also include "Never" and "Always" options. The `save_settings` method needs to correctly map these special ComboBox values back to appropriate storable values if necessary (e.g., sentinel numbers or specific strings if the backend configuration expects them for "Never"/"Always").
+
+4.  **Handle Simple Nested Settings (e.g., `general_settings`):**
+    *   **Action:** For `general_settings.invert_normal_map_green_channel_globally` (from `config/app_settings.json`):
+        *   Add a `QCheckBox` labeled "Invert Normal Map Green Channel Globally" to an appropriate tab (e.g., "Image Processing" or a "General" tab after layout review).
+        *   Update `populate_widgets_from_settings` to read `self.settings.get('general_settings', {}).get('invert_normal_map_green_channel_globally', False)`.
+        *   Update `save_settings` to write this value back to `target_file_content.setdefault('general_settings', {})['invert_normal_map_green_channel_globally'] = widget.isChecked()`.
+
+### Phase 2: Enhance `MAP_MERGE_RULES` Editor (in `gui/config_editor_dialog.py`)
+
+1.  **Rule Management:**
+    *   **Action:** In `populate_map_merging_tab`:
+        *   Connect the "Add Rule" button:
+            *   Create a default new rule dictionary (e.g., `{"output_map_type": "NEW_RULE", "inputs": {}, "defaults": {}, "output_bit_depth": "respect_inputs"}`).
+            *   Add it to the internal list of rules that will be saved (e.g., a copy of `self.settings['MAP_MERGE_RULES']` that gets modified).
+            *   Add a new `QListWidgetItem` for it and select it to display its details.
+        *   Connect the "Remove Rule" button:
+            *   Remove the selected rule from the internal list and the `QListWidget`.
+            *   Clear the details panel.
+
+2.  **Rule Details Panel Improvements (`display_merge_rule_details`):**
+    *   **`output_map_type`:** Change the `QLineEdit` to a `QComboBox`. Populate its items from `Configuration.get_file_type_keys()`.
+    *   **`inputs` Table:** The "Input Map Type" column cells should use a `QComboBox` delegate, populated with `Configuration.get_file_type_keys()` plus an empty/None option.
+    *   **`defaults` Table:** The "Default Value" column cells should use a `QDoubleSpinBox` delegate (e.g., range 0.0 to 1.0, or 0-255 if appropriate for specific channel types).
+    *   Ensure changes in these detail editors update the underlying rule data associated with the selected `QListWidgetItem` and the internal list of rules.
+
+### Phase 3: General UX & Table Interactivity (in `gui/config_editor_dialog.py`)
+
+1.  **Implement `IMAGE_RESOLUTIONS` Table Add/Remove Buttons:**
+    *   **Action:** In `populate_image_processing_tab`, connect the "Add Row" and "Remove Row" buttons for the `IMAGE_RESOLUTIONS` table.
+        *   "Add Row": Prompt for "Name" (string) and "Resolution (px)" (integer).
+        *   "Remove Row": Remove the selected row from the table and the underlying data.
+2.  **Implement Necessary Table Cell Delegates:**
+    *   **Action:** For the `IMAGE_RESOLUTIONS` table, the "Resolution (px)" column should use a `QSpinBox` delegate or a `QLineEdit` with integer validation to ensure correct data input.
+3.  **Review/Refine Tab Layout & Widget Grouping:**
+    *   **Action:** After the functional changes, review the overall layout of tabs and the grouping of settings within `gui/config_editor_dialog.py`.
+        *   Ensure settings from `config/app_settings.json` are logically placed and clearly labeled.
+        *   Verify widget labels are descriptive and tooltips are helpful where needed.
+        *   Confirm correct mapping between UI widgets and the keys in `app_settings.json` (e.g., `OUTPUT_FILENAME_PATTERN` vs. `TARGET_FILENAME_PATTERN`).
+
+## 4. Future Enhancements (Out of Scope for this Refactor)
+
+*   **Dedicated Editors for Definitions:** As per user feedback, if `ASSET_TYPE_DEFINITIONS` and `FILE_TYPE_DEFINITIONS` require UI-based editing, dedicated dialogs/widgets should be created. These would read from and save to their respective files ([`config/asset_type_definitions.json`](config/asset_type_definitions.json) and [`config/file_type_definitions.json`](config/file_type_definitions.json)) and could adopt a list/details UI similar to the `MAP_MERGE_RULES` editor.
+*   **Live Updates:** Consider mechanisms for applying some settings without requiring an application restart, if feasible for specific settings.
+
+This plan aims to create a more focused, usable, and correct preferences window.

gui/llm_editor_widget.py

@@ -1,6 +1,7 @@
 # gui/llm_editor_widget.py
 import json
 import logging
+import copy # Added for deepcopy
 from PySide6.QtWidgets import (
     QWidget, QVBoxLayout, QTabWidget, QPlainTextEdit, QGroupBox,
     QHBoxLayout, QPushButton, QFormLayout, QLineEdit, QDoubleSpinBox,
@@ -24,6 +25,7 @@ class LLMEditorWidget(QWidget):
     def __init__(self, parent=None):
         super().__init__(parent)
         self._unsaved_changes = False
+        self.original_llm_settings = {} # Initialize original_llm_settings
         self._init_ui()
         self._connect_signals()
         self.save_button.setEnabled(False) # Initially disabled
@@ -131,6 +133,7 @@ class LLMEditorWidget(QWidget):
         try:
             with open(LLM_CONFIG_PATH, 'r', encoding='utf-8') as f:
                 settings = json.load(f)
+            self.original_llm_settings = copy.deepcopy(settings) # Store a deep copy
 
             # Populate Prompt Settings
             self.prompt_editor.setPlainText(settings.get("llm_predictor_prompt", ""))
@@ -159,9 +162,9 @@ class LLMEditorWidget(QWidget):
             logger.info("LLM settings loaded successfully.")
 
         except FileNotFoundError:
-            logger.warning(f"LLM settings file not found: {LLM_CONFIG_PATH}. Using defaults and disabling editor.")
+            logger.warning(f"LLM settings file not found: {LLM_CONFIG_PATH}. Using defaults.")
             QMessageBox.warning(self, "Load Error",
-                                f"LLM settings file not found:\n{LLM_CONFIG_PATH}\n\nPlease ensure the file exists. Using default values.")
+                                f"LLM settings file not found:\n{LLM_CONFIG_PATH}\n\nNew settings will be created if you save.")
             # Reset to defaults (optional, or leave fields empty)
             self.prompt_editor.clear()
             self.endpoint_url_edit.clear()
@@ -169,19 +172,21 @@ class LLMEditorWidget(QWidget):
             self.model_name_edit.clear()
             self.temperature_spinbox.setValue(0.7)
             self.timeout_spinbox.setValue(120)
-            # self.setEnabled(False) # Disabling might be too harsh if user wants to create settings
+            self.original_llm_settings = {} # Start with empty original settings if file not found
 
         except json.JSONDecodeError as e:
             logger.error(f"Error decoding JSON from {LLM_CONFIG_PATH}: {e}")
             QMessageBox.critical(self, "Load Error",
                                  f"Failed to parse LLM settings file:\n{LLM_CONFIG_PATH}\n\nError: {e}\n\nPlease check the file for syntax errors. Editor will be disabled.")
             self.setEnabled(False) # Disable editor on critical load error
+            self.original_llm_settings = {} # Reset original settings on JSON error
 
         except Exception as e: # Catch other potential errors during loading/populating
              logger.error(f"An unexpected error occurred loading LLM settings: {e}", exc_info=True)
              QMessageBox.critical(self, "Load Error",
                                   f"An unexpected error occurred while loading settings:\n{e}\n\nEditor will be disabled.")
              self.setEnabled(False)
+             self.original_llm_settings = {} # Reset original settings on other errors
 
 
         # Reset unsaved changes flag and disable save button after loading
@@ -201,26 +206,38 @@ class LLMEditorWidget(QWidget):
         """Gather data from UI, save to JSON file, and handle errors."""
         logger.info("Attempting to save LLM settings...")
 
-        settings_dict = {}
+        # 1.a. Load Current Target File
+        target_file_content = {}
+        try:
+            with open(LLM_CONFIG_PATH, 'r', encoding='utf-8') as f:
+                target_file_content = json.load(f)
+        except FileNotFoundError:
+            logger.info(f"{LLM_CONFIG_PATH} not found. Will create a new one.")
+            target_file_content = {} # Start with an empty dict if file doesn't exist
+        except json.JSONDecodeError as e:
+            logger.error(f"Error decoding existing {LLM_CONFIG_PATH}: {e}. Starting with an empty config for save.")
+            QMessageBox.warning(self, "Warning",
+                                f"Could not parse existing LLM settings file ({LLM_CONFIG_PATH}).\n"
+                                f"Any pre-existing settings in that file might be overwritten if you save now.\nError: {e}")
+            target_file_content = {} # Start fresh if current file is corrupt
+
+        # 1.b. Gather current UI settings into current_llm_settings
+        current_llm_settings = {}
         parsed_examples = []
-        has_errors = False
+        has_errors = False # For example parsing
 
-        # Gather API Settings
-        settings_dict["llm_endpoint_url"] = self.endpoint_url_edit.text().strip()
-        settings_dict["llm_api_key"] = self.api_key_edit.text() # Keep as is, don't strip
-        settings_dict["llm_model_name"] = self.model_name_edit.text().strip()
-        settings_dict["llm_temperature"] = self.temperature_spinbox.value()
-        settings_dict["llm_request_timeout"] = self.timeout_spinbox.value()
+        current_llm_settings["llm_endpoint_url"] = self.endpoint_url_edit.text().strip()
+        current_llm_settings["llm_api_key"] = self.api_key_edit.text() # Keep as is
+        current_llm_settings["llm_model_name"] = self.model_name_edit.text().strip()
+        current_llm_settings["llm_temperature"] = self.temperature_spinbox.value()
+        current_llm_settings["llm_request_timeout"] = self.timeout_spinbox.value()
+        current_llm_settings["llm_predictor_prompt"] = self.prompt_editor.toPlainText().strip()
 
-        # Gather Prompt Settings
-        settings_dict["llm_predictor_prompt"] = self.prompt_editor.toPlainText().strip()
-
-        # Gather and Parse Examples
         for i in range(self.examples_tab_widget.count()):
             example_editor = self.examples_tab_widget.widget(i)
             if isinstance(example_editor, QTextEdit):
                 example_text = example_editor.toPlainText().strip()
-                if not example_text: # Skip empty examples silently
+                if not example_text:
                     continue
                 try:
                     parsed_example = json.loads(example_text)
@@ -231,40 +248,58 @@ class LLMEditorWidget(QWidget):
                     logger.warning(f"Invalid JSON in '{tab_name}': {e}. Skipping example.")
                     QMessageBox.warning(self, "Invalid Example",
                                         f"The content in '{tab_name}' is not valid JSON and will not be saved.\n\nError: {e}\n\nPlease correct it or remove the tab.")
-                    # Optionally switch to the tab with the error:
-                    # self.examples_tab_widget.setCurrentIndex(i)
             else:
                 logger.warning(f"Widget at index {i} in examples tab is not a QTextEdit. Skipping.")
 
-
         if has_errors:
             logger.warning("LLM settings not saved due to invalid JSON in examples.")
-            # Keep save button enabled if there were errors, allowing user to fix and retry
-            # self.save_button.setEnabled(True)
-            # self._unsaved_changes = True
-            return # Stop saving process
+            return
 
-        settings_dict["llm_predictor_examples"] = parsed_examples
+        current_llm_settings["llm_predictor_examples"] = parsed_examples
 
-        # Save the dictionary to file
+        # 1.c. Identify Changes and Update Target File Content
+        changed_settings_count = 0
+        for key, current_value in current_llm_settings.items():
+            original_value = self.original_llm_settings.get(key)
+
+            # Special handling for lists (e.g., examples) - direct comparison works
+            # For other types, direct comparison also works.
+            # This includes new keys present in current_llm_settings but not in original_llm_settings
+            if key not in self.original_llm_settings or current_value != original_value:
+                target_file_content[key] = current_value
+                logger.debug(f"Setting '{key}' changed or added. Old: '{original_value}', New: '{current_value}'")
+                changed_settings_count +=1
+
+        if changed_settings_count == 0 and self._unsaved_changes:
+             logger.info("Save called, but no actual changes detected compared to original loaded settings.")
+             # If _unsaved_changes was true, it means UI interaction happened,
+             # but values might have been reverted to original.
+             # We still proceed to save target_file_content as it might contain
+             # values from a file that was modified externally since last load.
+             # Or, if the file didn't exist, it will now be created with current UI values.
+
+        # 1.d. Save Updated Content
         try:
-            save_llm_config(settings_dict)
+            save_llm_config(target_file_content) # Save the potentially modified target_file_content
             QMessageBox.information(self, "Save Successful", f"LLM settings saved to:\n{LLM_CONFIG_PATH}")
+            
+            # Update original_llm_settings to reflect the newly saved state
+            self.original_llm_settings = copy.deepcopy(target_file_content)
+            
             self.save_button.setEnabled(False)
             self._unsaved_changes = False
-            self.settings_saved.emit() # Notify MainWindow or others
+            self.settings_saved.emit()
             logger.info("LLM settings saved successfully.")
 
         except ConfigurationError as e:
             logger.error(f"Failed to save LLM settings: {e}")
             QMessageBox.critical(self, "Save Error", f"Could not save LLM settings.\n\nError: {e}")
-            # Keep save button enabled as save failed
-            self.save_button.setEnabled(True)
+            self.save_button.setEnabled(True) # Keep save enabled
             self._unsaved_changes = True
-        except Exception as e: # Catch unexpected errors during save
+        except Exception as e:
             logger.error(f"An unexpected error occurred during LLM settings save: {e}", exc_info=True)
             QMessageBox.critical(self, "Save Error", f"An unexpected error occurred while saving settings:\n{e}")
-            self.save_button.setEnabled(True)
+            self.save_button.setEnabled(True) # Keep save enabled
             self._unsaved_changes = True
 
     # --- Example Management Slots ---

gui/main_window.py

@@ -27,6 +27,7 @@ from .llm_editor_widget import LLMEditorWidget
 from .log_console_widget import LogConsoleWidget
 from .main_panel_widget import MainPanelWidget
 
+from .definitions_editor_dialog import DefinitionsEditorDialog
 # --- Backend Imports for Data Structures ---
 from rule_structure import SourceRule, AssetRule, FileRule
 
@@ -861,6 +862,11 @@ class MainWindow(QMainWindow):
         self.preferences_action = QAction("&Preferences...", self)
         self.preferences_action.triggered.connect(self._open_config_editor)
         edit_menu.addAction(self.preferences_action)
+        edit_menu.addSeparator()
+
+        self.definitions_editor_action = QAction("Edit Definitions...", self)
+        self.definitions_editor_action.triggered.connect(self._open_definitions_editor)
+        edit_menu.addAction(self.definitions_editor_action)
 
         view_menu = self.menu_bar.addMenu("&View")
 
@@ -904,6 +910,17 @@ class MainWindow(QMainWindow):
             log.exception(f"Error opening configuration editor dialog: {e}")
             QMessageBox.critical(self, "Error", f"An error occurred while opening the configuration editor:\n{e}")
 
+    @Slot() # PySide6.QtCore.Slot
+    def _open_definitions_editor(self):
+        log.debug("Opening Definitions Editor dialog.")
+        try:
+            # DefinitionsEditorDialog is imported at the top of the file
+            dialog = DefinitionsEditorDialog(self)
+            dialog.exec_() # Use exec_() for modal dialog
+            log.debug("Definitions Editor dialog closed.")
+        except Exception as e:
+            log.exception(f"Error opening Definitions Editor dialog: {e}")
+            QMessageBox.critical(self, "Error", f"An error occurred while opening the Definitions Editor:\n{e}")
 
     @Slot(bool)
     def _toggle_log_console_visibility(self, checked):