dbeaver/pro#5650 hotfix -> release_26_1_5: Add fields for SSL: databend driver is enable in cb-ce (#4554)

* dbeaver/pro#10205 removes nanoid CVE

* dbeaver/pro#10205 fixes image-size CVE with updating LESS

---------

Co-authored-by: mr-anton-t <42037741+mr-anton-t@users.noreply.github.com>

.github/workflows/frontend-build.yml

@@ -46,7 +46,7 @@ jobs:
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: "lts/*"
+          node-version: "24.13.1"
           cache: "yarn"
           cache-dependency-path: |
             cloudbeaver/webapp/yarn.lock

.github/workflows/frontend-lint.yml

@@ -25,7 +25,7 @@ jobs:
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
-          node-version: "lts/*"
+          node-version: "24.13.1"
           cache: "yarn"
           cache-dependency-path: "./cloudbeaver/webapp/yarn.lock"
 

.github/workflows/push-pr-devel.yml

@@ -6,6 +6,7 @@ on:
       - opened
       - synchronize
       - reopened
+      - ready_for_review
   push:
     branches: [devel]
 
@@ -24,11 +25,6 @@ jobs:
       project-deps: ./cloudbeaver/project.deps
       timeout-minutes: 5
 
-  # build-server:
-  #   name: Server
-  #   uses: ./.github/workflows/backend-build.yml
-  #   secrets: inherit
-
   build-frontend:
     name: Frontend
     uses: ./.github/workflows/frontend-build.yml
@@ -38,6 +34,9 @@ jobs:
     name: Server
     uses: dbeaver/dbeaver-common/.github/workflows/java-checkstyle.yml@devel
     secrets: inherit
+    permissions:
+      contents: read
+      pull-requests: read
 
   lint-frontend:
     name: Frontend

.vscode/extensions.json

@@ -14,8 +14,7 @@
     "redhat.vscode-yaml",
     "streetsidesoftware.code-spell-checker",
     "streetsidesoftware.code-spell-checker-russian",
-    "syler.sass-indented",
-    "VisualStudioExptTeam.vscodeintellicode",
+    "github.copilot-chat",
     "yzhang.markdown-all-in-one",
     "GraphQL.vscode-graphql-syntax",
     "mrmlnc.vscode-json5",

.vscode/launch.json

@@ -48,6 +48,7 @@
         "-Declipse.pde.launch=true",
         "-XstartOnFirstThread",
         "-Dfile.encoding=UTF-8",
+        "--enable-native-access=ALL-UNNAMED",
         "--add-modules=ALL-DEFAULT",
         "--add-opens=java.base/java.io=ALL-UNNAMED",
         "--add-opens=java.base/java.lang=ALL-UNNAMED",
@@ -64,7 +65,6 @@
         "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED",
         "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
         "--add-opens=java.base/sun.security.ssl=ALL-UNNAMED",
-        "--add-opens=java.base/sun.security.action=ALL-UNNAMED",
         "--add-opens=java.base/sun.security.util=ALL-UNNAMED",
         "--add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED",
         "--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED",

.vscode/vscode-java-configs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-java-configs",
-  "packageManager": "yarn@4.9.2",
+  "packageManager": "yarn@4.14.1",
   "devDependencies": {
     "typescript": "^5.8.3"
   }

README.md

@@ -1,17 +1,20 @@
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" align="right" width="250"/>
+<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" alt="CloudBeaver logo" align="right" width="250"/>
 
 # CloudBeaver Community
 
 Cloud Database Manager - Community Edition.  
 CloudBeaver is a web server that provides a rich web interface. The server itself is a Java application, and the web part is written in TypeScript and React.  
 It is free to use and open-source (licensed under [Apache 2](https://github.com/dbeaver/cloudbeaver/blob/devel/LICENSE) license).  
-See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details. 
 
 <a><img src="https://github.com/dbeaver/cloudbeaver/wiki/images/connection-creation-demo.png" width="400"/></a>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/gis-demo.png" width="400"/>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/data-transfer-demo.png" width="400"/>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/sql-editor-demo.png" width="400"/>
 
+## Documentation
+- [GitHub WIKI](https://github.com/dbeaver/cloudbeaver/wiki)
+- [Official documentation](https://dbeaver.com/docs/cloudbeaver/)
+
 ## Run in Docker
 
 - [Official Docker repository](https://hub.docker.com/r/dbeaver/cloudbeaver)
@@ -19,48 +22,173 @@ See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.
 
 ## Demo server
 
-You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io  
+You can see a live demo of CloudBeaver server here: https://demo.cloudbeaver.io  
 
 [Database access instructions](https://github.com/dbeaver/cloudbeaver/wiki/Demo-Server)
 
 ## Changelog
 
-### 25.2.1 2025-09-22
-- Autocomplete values in SQL Editor are ordered alphabetically to simplify object search.
-- "Show all databases" setting was added on the connection page for MySQL and MariaDB.
-- Different bug fixes and enhancements have been made.
+### 26.1.4 2026-08-03
 
-### 25.2.0 2025-09-01
-### Changes since 25.1.0:
-- Administration:
-  -    Added support for multiple server URLs to accommodate different access policies for internal and external users, improving flexibility in network-restricted environments. To set it up, use the Allowed Server URLs field in the Server configuration within the Administration section;
-  -    Added the Force HTTPS mode setting in Server Configuration to enforce redirecting from HTTP to HTTPS. This setting helps avoid a potential man-in-the-middle attack. This setting is turned off by default. Please remember to configure your proxy before enabling;
-  -    Added the CLOUDBEAVER_BIND_SESSION_TO_IP option to improve session security by linking user sessions to their IP address. It is disabled by default. When enabled, this helps protect against certain types of session hijacking attacks, where an attacker could try to take over a user’s session. Note: Users will be logged out automatically on the IP address change (switching networks or using mobile data);
-  -    A password confirmation field has been added for administrators in the Easy Config section to prevent accidental misconfigurations.
-- SQL Editor:
-  -    Changed the default engine used for autocompletion in the SQL Editor. This Semantic engine offers improved suggestions for database objects, keywords, and functions. You can switch back to the Legacy engine in Preferences > SQL Editor;
-  -    A “Clear” button was added to the output panel.
-- Data Editor:
-  -    Column descriptions were added in the Data Editor under column names to provide more metadata context. You can disable this in Preferences > Data Viewer;
-  -    Added an ability to review the script before execution when users edit tables without primary keys.
+- AI Assistant:
+    - Added AI Chat to help users generate and fix queries and explore data more easily. It’s integrated with the SQL Editor to run generated queries instantly. Access it from the top toolbar. All AI features can be turned off in the Server configuration.
+    - Added the option to configure AI profiles in the Administration panel, usable in the AI Chat and for the @ai command in the SQL Editor. Both OpenAI and Copilot engines can be utilized for configuration.
+- Connectivity:
+    - Resolved the issue where the application could no longer connect to the database after running for an extended period.
+    - Resolved the issue where user connection settings required re-login in a new session to apply their changes.
+- Accessibility:
+    - Added a loader to the Save button in the Administration panel for visualizing the loading process.
+    - Improved drag-and-drop in the Navigator Tree for objects by enlarging the auto-scroll trigger areas.
 - General:
-  -    Added a new welcome screen for a freshly opened application. This screen contains shortcuts to create a new connection, open SQL Editor, or documentation;
-  -    Added a search panel for SQL Editor and Value panel: press Ctrl/Cmd + F to open a panel that allows searching and replacing by keyword or regular expression;
-  -    Changed the data transfer mechanism to avoid intermediate file creation. The parameter dataExportFileSizeLimit was removed from the server configuration as deprecated;
-  -    The CloudBeaver default theme matches the device theme by default now. You can change this behavior in user preferences under the Theme section;
-  -    Added the option to display tabs across multiple rows, allowing you to see all tabs without scrolling. You can enable this in Preferences > Interface;
-  -    Improved dark theme accessibility by enhancing color contrast across the app for better readability and compliance with accessibility standards;
-  -    The database navigator now automatically hides empty folders in shared projects, reducing visual clutter and speeding up the process of finding active connections.
+    - Added the ability to export generated SQL to a .sql file from the Generate SQL dialog.
+    - Improved "Open in SQL Editor" behavior by preserving the source table context for the Generate SQL dialog.
+    - Fixed synchronization between instances eliminates the need to refresh to see the updated connection or folder in another instance.
+- Security:
+    - Added a new "Auto-create users" setting for the reverse proxy provider, allowing new user creation on login. It is enabled by default.
+    - Updated the PostgreSQL JDBC driver to version 42.7.13, including a fix for a high-severity security vulnerability (CVE-2026-54291).
+    - Fixed the critical vulnerability (CVE-2026-59873) in the tar library. The library was updated to version 7.5.19.
+    - Fixed the high vulnerability (CVE-2026-10050) in the jetty-security library. The library was updated to version 12.1.11.
+    - Fixed the high vulnerability (CVE-2026-14257) in the brace-expansion library. The library was updated to version 5.0.8.
+    - Fixed the high vulnerability (GHSA-r28c-9q8g-f849) in the postcss library. The library was updated to version 8.5.18.
+    - Fixed the high vulnerability (GHSA-pm4m-ph32-ghv5) in the js-yaml library. The library was updated to version 5.2.2.
+    - Fixed the high vulnerability (CVE-2026-59880) in the immutable library. The library was updated to version 5.1.8.
+    - Fixed the high vulnerability (CVE-2026-59879) in the fast-uri library. The library was updated to version 3.1.3.
+    - Fixed the high vulnerability (CVE-2026-13311) in the shell-quote library. The library was updated to version 1.9.0.
+    - Fixed the high vulnerability (GHSA-gcfj-64vw-6mp9) in the axios library. The library was updated to version 1.18.0.
 - Databases and drivers:
-  -    Clickhouse: fixed the presentation of tuples and map data types in the Data Editor;
-  -    Databend database support has been added (thanks to @hantmac);
-  -    DuckDB: driver has been updated to version 1.3;
-  -    MySQL: Improved performance when retrieving foreign keys metadata;
-  -    PostgreSQL: fixed misplaced comment for table DDL generation.
+    - ClickHouse
+        - The driver was updated to version 0.10.0.
+        - Improved JSON display in the Value panel.
+    - MySQL: Fixed support for comments starting with '#' symbol in the SQL Editor.
+    - PostgreSQL:
+        - The driver was updated to version 42.7.13.
+        - Fixed an error that occurred when applying filters to database nodes.
+        - Fixed generated calls for procedures with OUT parameters.
 
-## Contribution
-As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 
+### 26.1.3 2026-07-20
 
-[We are happy to reward](https://dbeaver.com/help-dbeaver/) our most active contributors every major sprint.
-The most significant contribution to our code for the major release 25.2.0 was made by:
-1. [hantmac](https://github.com/hantmac) - added support for Databend in CloudBeaver Community Edition.
+- Data Editor:
+    - Fixed copying of large JSON values in the Data Editor - now the full value can be copied and transferred.
+    - Updated the Reference panel to show only relevant rows when a foreign key is null.
+- General:
+    - Added connection types to visually distinguish database environments using background colors across the Database Navigator and application UI. Users with edit permissions can assign built-in environment types color-coded configurations.
+- Data Transfer:
+    - Improved memory usage when importing large CSV files.
+    - Fixed CSV export with multi-character quotes and improved quote/delimiter validation
+- Accessibility:
+    - Enabled the use of the Enter or space keys to toggle checkboxes in the administration tabs and the metadata viewer.
+    - Added the ability to expand and collapse code block elements, including JSON, using the keyboard.
+    - Fixed shortcuts behavior for AZERTY keyboards. Now shortcuts like Ctrl/Cmd + Z work correctly.
+- Security:
+    - Resolved an authorization vulnerability when testing connections by enforcing strict permission checks. This mitigation prevented unauthenticated users from exploiting JDBC requests to read arbitrary server files.
+    - Resolved an LDAP injection vulnerability by properly escaping user input in the authentication username field, preventing attackers from manipulating search filters, bypassing access restrictions, and enumerating directory users.
+    - Fixed the high vulnerability (GHSA-gv7w-rqvm-qjhr) in the esbuild library. The library was updated to version 0.28.1.
+    - Fixed the high vulnerability (CVE-2026-12143) in the form-data library. The library was updated to version 4.0.6.
+- Databases and drivers:
+    - The Databend driver was updated to version 0.4.8.
+    - Fixed an issue related to the display of metadata in the navigation tree for DB2, Firebird, and MySQL.
+
+### 26.1.2 2026-07-06
+
+- Data Editor:
+    - Added the References panel showing related records from other tables connected by foreign keys. It helps to explore table relationships directly in the Data editor.
+    - Resolved an issue where the Data Editor ignored the text preview's maximum length quota. Increasing this quota now enables the ability to edit large values.
+- General:
+    - Added the Last Login time to the user form and the user table in the administration part.
+    - Fixed the bug with the inability to select entered text in the Find and Replace panel in editors.
+- Accessibility:
+    - Added the ability to use the Enter or Space key to turn checkboxes on/off in the connection properties tab.
+- Security:
+    - Fixed CVE-2026-55449. Resolved a local file disclosure vulnerability by enforcing strict validation of file identifiers and path containment during data updates.
+    - Updated session handling to prevent session fixation vulnerabilities. The application generates new session identifiers upon login.
+    - Fixed the high vulnerability (CVE-2026-12151) in the undici library. The library was updated to version 6.27.0.
+
+### 26.1.1 2026-06-22
+
+- General: Added a "Project Info" tab containing the project description to the project context menu.
+- Security:
+	- Fixed a cross-site scripting vulnerability caused by unsanitized user input in the web interface.
+	- Resolved a security flaw related to user-controlled file paths by adding strict validation to prevent unauthorized resource access.
+	- Fixed the critical vulnerability (CVE-2026-9277) in the shell-quote library (updated to version 1.8.4).
+
+### 26.1.0 2026-06-01
+
+### Changes since 26.0.0:
+
+- Administration:
+    - Added support for custom startup arguments when running CloudBeaver in a container. Administrators can specify configuration file locations to adapt the application to their environment. (thanks to @MalteHei)
+    - Updated the manifest.webmanifest file to generate dynamically based on the CLOUDBEAVER_ROOT_URI environment variable. (thanks to @houssemexo26)
+- Authorization:
+    - Added HTTP header authentication support for GraphQL queries. Users can provide API tokens via Authorization or X-Api-Key headers, allowing external data tools to authenticate without modifying request bodies.
+    - Fixed a bug in the authentication form: the existing password is now required for password changes.
+- SQL Editor:
+    - Updated the SQL Editor to use real tab characters for indentation. The application displayed tabs as four-space gaps with a distinct visual marker.
+    - Added an ability to view and edit scripts without connecting to the database.
+    - Added the ability to open generated queries right from the Generate SQL window.
+    - Added fuzzy search to SQL Editor auto-completion for object names. The feature allows users to find tables and containers even with typos or incorrect letter ordering.
+    - Added the tooltip about quoting rules for the Bind variables parameters dialog.
+    - Fixed keyword autocompletion for partially typed keywords to avoid redundant letters.
+- Data Editor:
+    - Added the ability to copy-paste multiple cells at once. Pasted values will be distributed across selected cells.
+    - Added an ability to add, duplicate, delete, or set values to NULL in multiple highlighted rows via the Data Editor context menu.
+    - Added the Find and Replace functionality for the Data Editor with the ability to find data by matching case, whole word, or using regular expressions.
+    - Data Editor started to keep the state of column configurations, such as filters, sorting, and ordering, after the reconnect, page refresh, and re-login.
+    - Added key column mark for tables with unique keys in the data grid.
+    - Added more settings to the Generated SQL window, including the ability to select fully qualified names for query or use compact SQL formatting.
+    - Added a DDL generation option to the Data Editor and Result Set context menu.
+    - Fixed copy and paste behavior for multiline and special characters in the Data Editor. Added visual glyphs to indicate line breaks and tabs in the data grid.
+    - Fixed the ability to copy Boolean values in the clipboard in the Data Editor.
+    - Fixed the ability to calculate row count for non-standard SELECT statements. (thanks to @fdcastel)
+- Navigator tree:
+    - Reorganized the context menu on the connection level to make it more compact.
+    - Added support for special symbols (pipe, comma, and asterisk) for the search field.
+    - Removed the "Folders" setting from the settings list for the Navigator Tree.
+- Accessibility:
+    - Added the Skip to content option for quick keyboard access to the Navigator Tree, editors, and shortcuts list tab to improve application accessibility.
+    - Improved keyboard navigation for context menu and buttons for Data Editor, SQL Editor, and Navigator tree.
+    - Added the Ctrl + / keyboard shortcut to open the context menu for selected cells in the Data Editor.
+    - Fixed the ability to switch tabs in the Data Editor using the keyboard.
+    - Fixed contrast for elements across different application parts in the light and dark themes to meet WCAG requirements.
+- General:
+    - Marked icons for non-saved (temporary) scripts with the hourglass symbol to add visual distinction from the saved ones.
+    - Added the ability to set to NULL any value in the Driver Properties.
+    - Fixed custom driver properties display for the connection page.
+    - Fixed data export in SQL format for values containing single quotes.
+- Databases and drivers:
+    - ClickHouse:
+        - Fixed the display of Array(JSON) types in the data grid.
+        - Updated driver version to 0.9.7.
+        - Fixed IP address display in the Data Editor by removing the leading slash.
+    - Added support for the "prompt=false" connection property for DB2 for IBM i to turn off interactive prompts and prevent related errors.
+    - DuckDB:
+        - Fixed map rendering for GEOMETRY types with CRS parameters.
+        - Fixed geometry type display for database versions > 1.5.
+    - H2 database:
+        - Added new embedded driver version 2.4.2.
+        - Updated server driver to version 2.4.2.
+    - Firebird: Expanded database-specific SQL dialect coverage for the SQL Editor. Added more keywords, built-in functions, and SQL generators.
+    - MySQL: Fixed query boundaries recognition in the SQL Editor for scripts with the DELIMITER keyword.
+    - PostgreSQL:
+        - Updated driver to version 42.7.11
+        - Fixed missing INOUT parameters in CHECK generation for procedures and functions.
+        - Fixed handling of 24:xx values in time columns.
+        - Fixed an error when connecting via URL if the database name contains a hyphen.
+    - SQL Server:
+        - Fixed DDL generation for external tables.
+        - Fixed the database connectivity issue after the Java update.
+- Security:
+    - Added an administrative setting to restrict SSH tunneling capabilities. Administrators can now limit tunnel configuration to authorized users, reducing the risk of unauthorized network access.
+    - Fixed the critical vulnerability (CVE-2025-62718) in the axios library. The library was updated to version 1.15.0.
+    - Fixed the high vulnerability (CVE-2026-4800) in the lodash library. The library was updated to version 4.18.0.
+    - Fixed the high vulnerability (CVE-2026-39363) in the vite library. The library was updated to version 7.3.2.
+    - Fixed the high vulnerability (CVE-2026-42035) in the axios library. The library was updated to version 1.15.1.
+    - Fixed the high vulnerability (CVE-2026-3505) in the bcpg-jdk18on library. The library was updated to version 1.84.0.
+    - Fixed the high vulnerability (CVE-2026-33671) in the picomatch library. The library was updated to version 2.3.2.
+    - Fixed the high vulnerability (CVE-2026-33943) in the happy-dom library. The library was updated to version 20.8.8.
+    - Fixed the high vulnerability (CVE-2025-45141) in the tar library. The library was updated to version 7.5.11.
+    - Fixed the high vulnerability (CVE-2026-27148) in the storybook library. The library was updated to version 10.2.10.
+    - Fixed the high vulnerability (CVE-2026-27606) in the rollup library. The library was updated to version 4.59.0.
+    - Fixed the high vulnerability (CVE-2026-27904) in the minimatch library. The library was updated to version 3.1.3.
+    - Fixed the high vulnerability (CVE-2026-27959) in the koa library. The library was updated to version 2.16.4.
+    - Fixed the high vulnerability (CVE-2026-32141) in the flatted library. The library was updated to version 4.4.0.
+    - Fixed the medium vulnerability (CVE-2026-41305) in the postcss library. The library was updated to version 8.5.14.

SECURITY.md

@@ -1,18 +1,6 @@
 # Security Policy
 
-## Supported Versions
-
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
-
-| Version | Supported |
-| ------- | --------- |
-| 22.x    | yes       |
-| 23.x    | yes       |
-| 24.x    | yes       |
-
 ## Reporting a Vulnerability
 
-Please report (suspected) security vulnerabilities to devops@dbeaver.com.
-You will receive a response from us within 48 hours.
+Please report (suspected) security vulnerabilities to <security@dbeaver.com>.
 If the issue is confirmed, we will release a patch as soon as possible, depending on complexity, but historically, within a few days.

apps/config-generator/pom.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>io.cloudbeaver</groupId>
+    <artifactId>config-generator</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.13.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <mainClass>io.cloudbeaver.ConfigGenerator</mainClass>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-external-config</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/config</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.basedir}/../../config/template</directory>
+                                    <includes>
+                                        <include>cloudbeaver-base.conf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

apps/config-generator/src/main/java/io/cloudbeaver/ConfigGenerator.java

@@ -0,0 +1,235 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import com.google.gson.*;
+import com.google.gson.reflect.TypeToken;
+
+import java.io.Reader;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+
+public class ConfigGenerator {
+
+    private static final Gson gson = new GsonBuilder()
+        .setPrettyPrinting()
+        .disableHtmlEscaping()
+        .create();
+    private static final String EMPTY_STRING = "''";
+
+
+    public static void main(String[] args) throws Exception {
+        String baseConfigPath = System.getProperty("config.base");
+        if (baseConfigPath == null || baseConfigPath.isEmpty()) {
+            URL resource = ConfigGenerator.class.getClassLoader().getResource("config/cloudbeaver-base.conf");
+            if (resource == null) {
+                System.out.println("Base config path is required");
+                return;
+            }
+            baseConfigPath = resource.toURI().getPath();
+            if (System.getProperty("os.name").toLowerCase().contains("win")) {
+                // Fix for Windows in dev mode. Resource URI starts with / (e.g. /C:/some/folder)
+                // And this breaks Java NIO
+                if (baseConfigPath.startsWith("/")) {
+                    baseConfigPath = baseConfigPath.substring(1);
+                }
+            }
+        }
+        String outputPath = System.getProperty("config.output");
+        if (outputPath == null || outputPath.isEmpty()) {
+            System.out.println("Output config path is required");
+            return;
+        }
+
+        String configPatches = System.getProperty("config.patches");
+
+        List<String> overrideConfigs = configPatches == null ? List.of() : Arrays.asList(configPatches.split(","));
+
+        Map<String, Object> config = readConfigurationFile(baseConfigPath);
+        System.out.println("Base config loaded");
+
+        for (String overrideConfig : overrideConfigs) {
+            if (Files.exists(Path.of(overrideConfig))) {
+                System.out.println("Applying override config: " + overrideConfig);
+            } else {
+                System.out.println("Override config not found, skipping: " + overrideConfig);
+                continue;
+            }
+            System.out.println("Processing override config: " + overrideConfig);
+            Map<String, Object> overrideConfigMap = readConfigurationFile(overrideConfig);
+            System.out.println("Override config loaded: " + overrideConfig);
+            applyProductConfig(config, overrideConfigMap);
+            System.out.println("Override config applied: " + overrideConfig);
+        }
+
+        Map<String, Object> finalMap = convertToOutputFormat(config);
+        System.out.println("Config converted to output format");
+
+        writeConfigurationFile(finalMap, outputPath);
+        System.out.println("Config written to: " + outputPath);
+    }
+
+    private static Map<String, Object> readConfigurationFile(String filePath) throws Exception {
+        Path path = Path.of(filePath);
+        if (!Files.exists(path)) {
+            throw new IllegalArgumentException("Configuration file not found: " + filePath);
+        }
+
+        try (Reader reader = Files.newBufferedReader(path)) {
+            return gson.fromJson(reader, TypeToken.getParameterized(Map.class, String.class, Object.class).getType());
+        }
+    }
+
+    private static void applyProductConfig(Map<String, Object> baseConfig, Map<String, Object> productConfig) {
+        if (productConfig.containsKey("add")) {
+            Map<String, Object> add = (Map<String, Object>) productConfig.get("add");
+            deepMergeMap(baseConfig, add);
+        }
+
+        if (productConfig.containsKey("remove")) {
+            Map<String, Object> remove = (Map<String, Object>) productConfig.get("remove");
+            deepRemoveMap(baseConfig, remove);
+        }
+    }
+
+    private static void deepMergeMap(Map<String, Object> target, Map<String, Object> source) {
+        for (Map.Entry<String, Object> entry : source.entrySet()) {
+            Object sourceValue = entry.getValue();
+            Object targetValue = target.get(entry.getKey());
+
+            if (sourceValue instanceof Map && targetValue instanceof Map) {
+                deepMergeMap((Map<String, Object>) targetValue, (Map<String, Object>) sourceValue);
+            } else {
+                target.put(entry.getKey(), sourceValue);
+            }
+        }
+    }
+
+    private static void deepRemoveMap(Map<String, Object> target, Map<String, Object> source) {
+        for (Map.Entry<String, Object> entry : source.entrySet()) {
+            Object sourceValue = entry.getValue();
+            Object targetValue = target.get(entry.getKey());
+
+            if (sourceValue instanceof Map && targetValue instanceof Map) {
+                deepRemoveMap((Map<String, Object>) targetValue, (Map<String, Object>) sourceValue);
+            } else {
+                target.remove(entry.getKey());
+            }
+        }
+    }
+
+    private static void writeConfigurationFile(Map<String, Object> map, String filePath) throws Exception {
+        JsonElement tree = gson.toJsonTree(map);
+        StringBuilder sb = new StringBuilder();
+        writeElement(tree, sb, 0);
+        Files.write(Path.of(filePath), sb.toString().getBytes());
+    }
+
+    private static void writeElement(JsonElement elem, StringBuilder sb, int count) {
+        String indent = "    ";
+        if (elem.isJsonObject()) {
+            sb.append("{\n");
+            JsonObject obj = elem.getAsJsonObject();
+            var iterator = obj.entrySet().iterator();
+
+            while (iterator.hasNext()) {
+                var entry = iterator.next();
+                sb.repeat(indent, count + 1).append(entry.getKey()).append(": ");
+                writeElement(entry.getValue(), sb, count + 1);
+                if (iterator.hasNext()) {
+                    sb.append(",");
+                }
+                sb.append("\n");
+            }
+            sb.repeat(indent, count).append("}");
+
+        } else if (elem.isJsonArray()) {
+            sb.append("[\n");
+            JsonArray array = elem.getAsJsonArray();
+            for (int i = 0; i < array.size(); i++) {
+                sb.repeat(indent, count + 1);
+                writeElement(array.get(i), sb, count + 1);
+                if (i < array.size() - 1) {
+                    sb.append(",");
+                }
+                sb.append("\n");
+            }
+            sb.repeat(indent, count).append("]");
+
+        } else {
+            String valueStr = gson.toJson(elem).replace("\n", "\n" + indent);
+            sb.append(valueStr);
+        }
+    }
+
+    private static Map<String, Object> convertToOutputFormat(Map<String, Object> map) {
+        Map<String, Object> result = new LinkedHashMap<>();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            result.put(entry.getKey(), convertValue(entry.getValue()));
+        }
+        return result;
+    }
+
+    private static Object convertValue(Object value) {
+        if (value instanceof Map) {
+            Map<String, Object> map = (Map<String, Object>) value;
+            if (!map.isEmpty() && map.containsKey("value")) {
+                if (map.containsKey("env")) {
+                    String env = (String) map.get("env");
+                    Object defValue = map.get("value");
+                    return "${" + env + ":" + formatDefaultValue(defValue) + "}";
+                } else {
+                    return convertValue(map.get("value"));
+                }
+            }
+            Map<String, Object> result = new LinkedHashMap<>();
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                result.put(entry.getKey(), convertValue(entry.getValue()));
+            }
+            return result;
+        } else if (value instanceof List) {
+            List<Object> list = (List<Object>) value;
+            List<Object> result = new ArrayList<>();
+            for (Object item : list) {
+                result.add(convertValue(item));
+            }
+            return result;
+        }
+        return value;
+    }
+
+    private static String formatDefaultValue(Object value) {
+        return switch (value) {
+            case null -> EMPTY_STRING;
+            case String str -> str.isEmpty() ? EMPTY_STRING : str;
+            case Boolean b -> value.toString();
+            case Number number -> {
+                if (number instanceof Double || number instanceof Float) {
+                    long longVal = number.longValue();
+                    if (longVal == number.doubleValue()) {
+                        yield String.valueOf(longVal);
+                    }
+                }
+                yield number.toString();
+            }
+            // TODO: handle list elements if needed
+            default -> value.toString();
+        };
+    }
+}

config/core/cloudbeaver.conf

@@ -1,99 +0,0 @@
-{
-    server: {
-        serverPort: "${CLOUDBEAVER_WEB_SERVER_PORT:8978}",
-        forceHttps: "${CLOUDBEAVER_FORCE_HTTPS:false}",
-
-        contentRoot: "web",
-        driversLocation: "drivers",
-
-        sslConfigurationPath:"${CLOUDBEAVER_SSL_CONF_PATH:workspace/.data/ssl-config.xml}",
-
-        rootURI: "${CLOUDBEAVER_ROOT_URI:/}",
-        serviceURI: "/api/",
-        supportedHosts: [],
-
-        productSettings: {
-            # Global properties
-            core.theming.theme: "${CLOUDBEAVER_CORE_THEMING_THEME:system}",
-            core.localization.language: "${CLOUDBEAVER_CORE_LOCALIZATION:en}",
-            plugin.sql-editor.autoSave: "${CLOUDBEAVER_SQL_EDITOR_AUTOSAVE:true}",
-            plugin.sql-editor.disabled: "${CLOUDBEAVER_SQL_EDITOR_DISABLED:false}",
-            # max size of the file that can be uploaded to the editor (in kilobytes)
-            plugin.sql-editor.maxFileSize: "${CLOUDBEAVER_SQL_EDITOR_MAX_FILE_SIZE:10240}",
-            plugin.log-viewer.disabled: "${CLOUDBEAVER_LOG_VIEWER_DISABLED:false}",
-            plugin.log-viewer.logBatchSize: "${CLOUDBEAVER_LOG_VIEWER_LOG_BATCH_SIZE:1000}",
-            plugin.log-viewer.maxLogRecords: "${CLOUDBEAVER_LOG_VIEWER_MAX_LOG_RECORDS:2000}",
-            sql.proposals.insert.table.alias: "${CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS:PLAIN}",
-            SQLEditor.ContentAssistant.experimental.mode: "${CLOUDBEAVER_SQL_EDITOR_CONTENT_ASSISTANT_EXPERIMENTAL_MODE:NEW}"
-        },
-
-        expireSessionAfterPeriod: "${CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD:1800000}",
-        bindSessionToIp: "${CLOUDBEAVER_BIND_SESSION_TO_IP:disable}",
-        develMode: "${CLOUDBEAVER_DEVEL_MODE:false}",
-
-        enableSecurityManager: false,
-
-        sm: {
-            enableBruteForceProtection: "${CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED:true}",
-            maxFailedLogin: "${CLOUDBEAVER_MAX_FAILED_LOGINS:10}",
-            minimumLoginTimeout: "${CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT:1}",
-            blockLoginPeriod: "${CLOUDBEAVER_BLOCK_PERIOD:300}",
-            passwordPolicy: {
-                minLength: "${CLOUDBEAVER_POLICY_MIN_LENGTH:8}",
-                requireMixedCase: "${CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE:true}",
-                minNumberCount: "${CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT:1}",
-                minSymbolCount: "${CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT:0}"
-            }
-        },
-
-        database: {
-            driver: "${CLOUDBEAVER_DB_DRIVER:h2_embedded_v2}",
-            url: "${CLOUDBEAVER_DB_URL:jdbc:h2:${workspace}/.data/cb.h2v2.dat}",
-            schema: "${CLOUDBEAVER_DB_SCHEMA:''}",
-            user: "${CLOUDBEAVER_DB_USER:''}",
-            password: "${CLOUDBEAVER_DB_PASSWORD:''}",
-            initialDataConfiguration: "${CLOUDBEAVER_DB_INITIAL_DATA:conf/initial-data.conf}",
-            pool: {
-                minIdleConnections: "${CLOUDBEAVER_DB_MIN_IDLE_CONNECTIONS:4}",
-                maxIdleConnections: "${CLOUDBEAVER_DB_MAX_IDLE_CONNECTIONS:10}",
-                maxConnections: "${CLOUDBEAVER_DB_MAX_CONNECTIONS:100}",
-                validationQuery: "${CLOUDBEAVER_DB_VALIDATION_QUERY:SELECT 1}"
-            },
-            backupEnabled: "${CLOUDBEAVER_DB_BACKUP_ENABLED:true}"
-        }
-
-    },
-    app: {
-        anonymousAccessEnabled: "${CLOUDBEAVER_APP_ANONYMOUS_ACCESS_ENABLED:true}",
-        anonymousUserRole: user,
-        defaultUserTeam: "${CLOUDBEAVER_APP_DEFAULT_USER_TEAM:user}",
-        grantConnectionsAccessToAnonymousTeam: "${CLOUDBEAVER_APP_GRANT_CONNECTIONS_ACCESS_TO_ANONYMOUS_TEAM:false}",
-        supportsCustomConnections: "${CLOUDBEAVER_APP_SUPPORTS_CUSTOM_CONNECTIONS:false}",
-        showReadOnlyConnectionInfo: "${CLOUDBEAVER_APP_READ_ONLY_CONNECTION_INFO:false}",
-        systemVariablesResolvingEnabled: "${CLOUDBEAVER_SYSTEM_VARIABLES_RESOLVING_ENABLED:false}",
-
-        forwardProxy: "${CLOUDBEAVER_APP_FORWARD_PROXY:false}",
-
-        publicCredentialsSaveEnabled: "${CLOUDBEAVER_APP_PUBLIC_CREDENTIALS_SAVE_ENABLED:true}",
-        adminCredentialsSaveEnabled: "${CLOUDBEAVER_APP_ADMIN_CREDENTIALS_SAVE_ENABLED:true}",
-
-        resourceManagerEnabled: "${CLOUDBEAVER_APP_RESOURCE_MANAGER_ENABLED:true}",
-
-        resourceQuotas: {
-            resourceManagerFileSizeLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_RESOURCE_MANAGER_FILE_SIZE_LIMIT:500000}",
-            sqlMaxRunningQueries: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_MAX_RUNNING_QUERIES:100}",
-            sqlResultSetRowsLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_RESULT_SET_ROWS_LIMIT:100000}",
-            sqlTextPreviewMaxLength: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_TEXT_PREVIEW_MAX_LENGTH:4096}",
-            sqlBinaryPreviewMaxLength: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_BINARY_PREVIEW_MAX_LENGTH:261120}"
-        },
-        enabledAuthProviders: [
-            "local"
-        ],
-
-        disabledBetaFeatures: [
-
-        ]
-
-    }
-
-}

config/template/cloudbeaver-base.conf

@@ -0,0 +1,271 @@
+{
+    server: {
+        serverPort: {
+            env: "CLOUDBEAVER_WEB_SERVER_PORT",
+            value: 8978
+        },
+
+        forceHttps: {
+            env: "CLOUDBEAVER_FORCE_HTTPS",
+            value: false
+        },
+
+        contentRoot: {
+            env: "CLOUDBEAVER_CONTENT_ROOT",
+            value: "web"
+        },
+
+        driversLocation: {
+            env: "CLOUDBEAVER_DRIVERS_LOCATION",
+            value: "drivers"
+        },
+
+        sslConfigurationPath: {
+            env: "CLOUDBEAVER_SSL_CONF_PATH",
+            value: "workspace/.data/ssl-config.xml"
+        },
+
+        rootURI: {
+            env: "CLOUDBEAVER_ROOT_URI",
+            value: "/"
+        },
+
+        serviceURI: {
+            env: "CLOUDBEAVER_SERVICE_URI",
+            value: "/api/"
+        },
+
+        supportedHosts: [],
+
+        productSettings: {
+            core.theming.theme: {
+                env: "CLOUDBEAVER_CORE_THEMING_THEME",
+                value: "system"
+            },
+            core.localization.language: {
+                env: "CLOUDBEAVER_CORE_LOCALIZATION",
+                value: "en"
+            },
+            plugin.sql-editor.autoSave: {
+                env: "CLOUDBEAVER_SQL_EDITOR_AUTOSAVE",
+                value: true
+            },
+            plugin.sql-editor.disabled: {
+                env: "CLOUDBEAVER_SQL_EDITOR_DISABLED",
+                value: false
+            },
+            plugin.sql-editor.maxFileSize: {
+                env: "CLOUDBEAVER_SQL_EDITOR_MAX_FILE_SIZE",
+                value: 10240
+            },
+            plugin.log-viewer.disabled: {
+                env: "CLOUDBEAVER_LOG_VIEWER_DISABLED",
+                value: false
+            },
+            plugin.log-viewer.logBatchSize: {
+                env: "CLOUDBEAVER_LOG_VIEWER_LOG_BATCH_SIZE",
+                value: 1000
+            },
+            plugin.log-viewer.maxLogRecords: {
+                env: "CLOUDBEAVER_LOG_VIEWER_MAX_LOG_RECORDS",
+                value: 2000
+            },
+            sql.proposals.insert.table.alias: {
+                env: "CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS",
+                value: "PLAIN"
+            },
+            SQLEditor.ContentAssistant.experimental.mode: {
+                env: "CLOUDBEAVER_SQL_EDITOR_CONTENT_ASSISTANT_EXPERIMENTAL_MODE",
+                value: "NEW"
+            }
+        },
+
+        expireSessionAfterPeriod: {
+            env: "CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD",
+            value: 1800000
+        },
+
+        bindSessionToIp: {
+            env: "CLOUDBEAVER_BIND_SESSION_TO_IP",
+            value: "disable"
+        },
+
+        develMode: {
+            env: "CLOUDBEAVER_DEVEL_MODE",
+            value: false
+        },
+
+        sm: {
+            enableBruteForceProtection: {
+                env: "CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED",
+                value: true
+            },
+            maxFailedLogin: {
+                env: "CLOUDBEAVER_MAX_FAILED_LOGINS",
+                value: 10
+            },
+            minimumLoginTimeout: {
+                env: "CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT",
+                value: 1
+            },
+            blockLoginPeriod: {
+                env: "CLOUDBEAVER_BLOCK_PERIOD",
+                value: 300
+            },
+
+            passwordPolicy: {
+                minLength: {
+                    env: "CLOUDBEAVER_POLICY_MIN_LENGTH",
+                    value: 8
+                },
+                requireMixedCase: {
+                    env: "CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE",
+                    value: true
+                },
+                minNumberCount: {
+                    env: "CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT",
+                    value: 1
+                },
+                minSymbolCount: {
+                    env: "CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT",
+                    value: 0
+                }
+            }
+        },
+
+        database: {
+            driver: {
+                env: "CLOUDBEAVER_DB_DRIVER",
+                value: "h2_embedded_v2"
+            },
+            url: {
+                env: "CLOUDBEAVER_DB_URL",
+                value: "jdbc:h2:${workspace}/.data/cb.h2v2.dat"
+            },
+            schema: {
+                env: "CLOUDBEAVER_DB_SCHEMA",
+                value: ""
+            },
+            user: {
+                env: "CLOUDBEAVER_DB_USER",
+                value: ""
+            },
+            password: {
+                env: "CLOUDBEAVER_DB_PASSWORD",
+                value: ""
+            },
+            initialDataConfiguration: {
+                env: "CLOUDBEAVER_DB_INITIAL_DATA",
+                value: "conf/initial-data.conf"
+            },
+
+            pool: {
+                minIdleConnections: {
+                    env: "CLOUDBEAVER_DB_MIN_IDLE_CONNECTIONS",
+                    value: 4
+                },
+                maxIdleConnections: {
+                    env: "CLOUDBEAVER_DB_MAX_IDLE_CONNECTIONS",
+                    value: 10
+                },
+                maxConnections: {
+                    env: "CLOUDBEAVER_DB_MAX_CONNECTIONS",
+                    value: 100
+                },
+                validationQuery: {
+                    env: "CLOUDBEAVER_DB_VALIDATION_QUERY",
+                    value: "SELECT 1"
+                }
+            },
+
+            backupEnabled: {
+                env: "CLOUDBEAVER_DB_BACKUP_ENABLED",
+                value: true
+            }
+        }
+    },
+
+    app: {
+        anonymousAccessEnabled: {
+            env: "CLOUDBEAVER_APP_ANONYMOUS_ACCESS_ENABLED",
+            value: true
+        },
+
+        anonymousUserRole: {
+            env: "CLOUDBEAVER_APP_ANONYMOUS_USER_ROLE",
+            value: "user"
+        },
+
+        defaultUserTeam: {
+            env: "CLOUDBEAVER_APP_DEFAULT_USER_TEAM",
+            value: "user"
+        },
+
+        grantConnectionsAccessToAnonymousTeam: {
+            env: "CLOUDBEAVER_APP_GRANT_CONNECTIONS_ACCESS_TO_ANONYMOUS_TEAM",
+            value: false
+        },
+
+        supportsCustomConnections: {
+            env: "CLOUDBEAVER_APP_SUPPORTS_CUSTOM_CONNECTIONS",
+            value: false
+        },
+
+        showReadOnlyConnectionInfo: {
+            env: "CLOUDBEAVER_APP_READ_ONLY_CONNECTION_INFO",
+            value: false
+        },
+
+        systemVariablesResolvingEnabled: {
+            env: "CLOUDBEAVER_SYSTEM_VARIABLES_RESOLVING_ENABLED",
+            value: false
+        },
+
+        forwardProxy: {
+            env: "CLOUDBEAVER_APP_FORWARD_PROXY",
+            value: false
+        },
+
+        publicCredentialsSaveEnabled: {
+            env: "CLOUDBEAVER_APP_PUBLIC_CREDENTIALS_SAVE_ENABLED",
+            value: true
+        },
+
+        adminCredentialsSaveEnabled: {
+            env: "CLOUDBEAVER_APP_ADMIN_CREDENTIALS_SAVE_ENABLED",
+            value: true
+        },
+
+        resourceManagerEnabled: {
+            env: "CLOUDBEAVER_APP_RESOURCE_MANAGER_ENABLED",
+            value: true
+        },
+
+        resourceQuotas: {
+            resourceManagerFileSizeLimit: {
+                env: "CLOUDBEAVER_RESOURCE_QUOTA_RESOURCE_MANAGER_FILE_SIZE_LIMIT",
+                value: 500000
+            },
+            sqlMaxRunningQueries: {
+                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_MAX_RUNNING_QUERIES",
+                value: 100
+            },
+            sqlResultSetRowsLimit: {
+                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_RESULT_SET_ROWS_LIMIT",
+                value: 100000
+            },
+            sqlTextPreviewMaxLength: {
+                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_TEXT_PREVIEW_MAX_LENGTH",
+                value: 4096
+            },
+            sqlBinaryPreviewMaxLength: {
+                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_BINARY_PREVIEW_MAX_LENGTH",
+                value: 261120
+            }
+        },
+
+        enabledAuthProviders: ["local"],
+
+        disabledBetaFeatures: []
+    }
+}

deploy/build-backend.sh

@@ -18,7 +18,6 @@ cd ../..
 echo "Pull dbeaver platform"
 [ ! -d dbeaver ] && git clone --depth 1 https://github.com/dbeaver/dbeaver.git
 [ ! -d dbeaver-common ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-common.git
-[ ! -d dbeaver-jdbc-libsql ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-jdbc-libsql.git
 
 
 cd cloudbeaver/deploy
@@ -32,6 +31,9 @@ if [[ "$?" -ne 0 ]] ; then
 fi
 cd ../../../deploy
 
+echo "Generate cloudbeaver.conf file"
+mvn -f ../apps/config-generator compile exec:java -Dconfig.output="cloudbeaver/conf/cloudbeaver.conf"
+
 echo "Copy server packages"
 
 cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server

deploy/build-frontend.sh

@@ -8,7 +8,15 @@ mkdir -p ./cloudbeaver/web
 cd ../../cloudbeaver/webapp
 
 yarn install --immutable
-cd ./packages/product-default
+yarn clear
+
+cd common-react
+yarn clear
+
+cd ../common-typescript
+yarn clear
+
+cd ../packages/product-default
 yarn run bundle
 
 if [[ "$?" -ne 0 ]] ; then

deploy/build.bat

@@ -20,7 +20,6 @@ echo Pull dbeaver platform
 
 IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
 IF NOT EXIST dbeaver-common git clone https://github.com/dbeaver/dbeaver-common.git
-IF NOT EXIST dbeaver-jdbc-libsql git clone https://github.com/dbeaver/dbeaver-jdbc-libsql.git
 
 cd cloudbeaver\deploy
 
@@ -43,6 +42,9 @@ copy ..\config\DefaultConfiguration\GlobalConfiguration\.dbeaver\data-sources.js
 
 move drivers cloudbeaver >NUL
 
+echo Generate cloudbeaver.conf file
+call mvn -f ..\apps\config-generator compile exec:java -Dconfig.output="cloudbeaver\conf\cloudbeaver.conf" || goto :error
+
 echo "Build static content"
 
 mkdir .\cloudbeaver\web

deploy/docker/base-java/Dockerfile

@@ -1,4 +1,5 @@
-FROM ubuntu:24.04
+# Ubuntu 24.04 (Noble Numbat)
+FROM ubuntu:noble
 
 MAINTAINER DBeaver Corp, devops@dbeaver.com
 
@@ -8,8 +9,6 @@ RUN set -eux; \
     apt-get update && \
     apt-get dist-upgrade -y --no-install-recommends && \
     apt-get install -y --no-install-recommends \
-        # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255
-        curl \
         # java.lang.UnsatisfiedLinkError: libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
         # java.lang.NoClassDefFoundError: Could not initialize class sun.awt.X11FontManager
         # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
@@ -31,7 +30,7 @@ RUN set -eux; \
 ENV LANG=en_US.UTF-8
 
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:25-jdk-noble $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 
 RUN set -eux; \

deploy/scripts/launch-product.sh

@@ -13,7 +13,7 @@ if [ "$(id -u)" -eq 0 ]; then
 
     chown -R $DBEAVER_UID:$DBEAVER_GID $PWD/workspace
     # Execute run-cloudbeaver-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables
-    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-cloudbeaver-server.sh"
+    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-cloudbeaver-server.sh $*"
 else
-    exec ./run-cloudbeaver-server.sh
-fi
+    exec ./run-cloudbeaver-server.sh "$@"
+fi

deploy/scripts/run-cloudbeaver-server.bat

@@ -17,6 +17,7 @@ If Not Defined JAVA_OPTS (
 
 java %JAVA_OPTS% ^
     -Dfile.encoding=UTF-8 ^
+    --enable-native-access=ALL-UNNAMED ^
     --add-modules=ALL-DEFAULT ^
     --add-opens=java.base/java.io=ALL-UNNAMED ^
     --add-opens=java.base/java.lang=ALL-UNNAMED ^
@@ -33,7 +34,6 @@ java %JAVA_OPTS% ^
     --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED  ^
     --add-opens=java.base/sun.nio.ch=ALL-UNNAMED ^
     --add-opens=java.base/sun.security.ssl=ALL-UNNAMED ^
-    --add-opens=java.base/sun.security.action=ALL-UNNAMED ^
     --add-opens=java.base/sun.security.util=ALL-UNNAMED ^
     --add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED ^
     --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED ^

deploy/scripts/run-cloudbeaver-server.sh

@@ -11,6 +11,7 @@ echo "Starting Cloudbeaver Server"
 
 exec java ${JAVA_OPTS} \
   -Dfile.encoding=UTF-8 \
+  --enable-native-access=ALL-UNNAMED \
   --add-modules=ALL-DEFAULT \
   --add-opens=java.base/java.io=ALL-UNNAMED \
   --add-opens=java.base/java.lang=ALL-UNNAMED \
@@ -27,7 +28,6 @@ exec java ${JAVA_OPTS} \
   --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED \
   --add-opens=java.base/sun.nio.ch=ALL-UNNAMED \
   --add-opens=java.base/sun.security.ssl=ALL-UNNAMED \
-  --add-opens=java.base/sun.security.action=ALL-UNNAMED \
   --add-opens=java.base/sun.security.util=ALL-UNNAMED \
   --add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED \
   --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED \
@@ -35,7 +35,7 @@ exec java ${JAVA_OPTS} \
   --add-opens=java.sql/java.sql=ALL-UNNAMED \
   -jar ${launcherJar} \
   -product io.cloudbeaver.product.ce.product \
-  -web-config conf/cloudbeaver.conf \
   "$@" \
+  -web-config conf/cloudbeaver.conf \
   -nl en \
   -registryMultiLanguage

project.deps

@@ -1,3 +1,2 @@
 dbeaver-common
-dbeaver-jdbc-libsql
 dbeaver

server/bundles/io.cloudbeaver.model.cli/META-INF/MANIFEST.MF

@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Vendor: DBeaver Corp
+Bundle-Name: Cloudbeaver Web Model
+Bundle-SymbolicName: io.cloudbeaver.model.cli;singleton:=true
+Bundle-Version: 1.0.16.qualifier
+Bundle-Release-Date: 20260817
+Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.jkiss.dbeaver.model.cli;visibility:=reexport
+Export-Package: io.cloudbeaver.model.cli
+Automatic-Module-Name: io.cloudbeaver.model.cli
+Import-Package: org.slf4j

server/bundles/io.cloudbeaver.model.cli/build.properties

@@ -0,0 +1,5 @@
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+    META-INF/,\
+    plugin.xml

server/bundles/io.cloudbeaver.model.cli/plugin.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<plugin>
+
+</plugin>

server/bundles/io.cloudbeaver.model.cli/pom.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+         <relativePath>../</relativePath>
+    </parent>
+    <artifactId>io.cloudbeaver.model.cli</artifactId>
+    <version>1.0.16-SNAPSHOT</version>
+    <packaging>eclipse-plugin</packaging>
+
+</project>

server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java

@@ -0,0 +1,66 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.cli;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.cli.ApplicationCommandLine;
+import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
+import org.jkiss.dbeaver.model.cli.CLIContextImpl;
+import org.jkiss.dbeaver.model.cli.CLIRunMeta;
+import org.jkiss.dbeaver.model.cli.registry.CLICommandDescriptor;
+import picocli.CommandLine;
+
+import java.util.List;
+
+public class CloudBeaverCommandLine extends ApplicationCommandLine<ApplicationInstanceController> {
+    private final CloudBeaverMixin mixin;
+
+    public CloudBeaverCommandLine() {
+        super();
+        this.mixin = new CloudBeaverMixin();
+    }
+
+    public CloudBeaverCommandLine(
+        @NotNull CloudBeaverMixin mixin
+    ) {
+        super();
+        this.mixin = mixin;
+    }
+
+    @Override
+    protected CloudBeaverTopLevelCommand createTopLevelCommand(
+        @Nullable ApplicationInstanceController applicationInstanceController,
+        @NotNull CLIContextImpl context,
+        @NotNull CLIRunMeta runMeta
+    ) {
+        return new CloudBeaverTopLevelCommand(applicationInstanceController, context, runMeta);
+    }
+
+    @NotNull
+    @Override
+    protected CommandLine initCommandLine(
+        @Nullable ApplicationInstanceController applicationInstanceController,
+        @NotNull CLIContextImpl context,
+        @NotNull CLIRunMeta runMeta,
+        @NotNull List<CLICommandDescriptor> commandsToExecute
+    ) {
+        var cmd = super.initCommandLine(applicationInstanceController, context, runMeta, commandsToExecute);
+        cmd.addMixin("cloudbeaver", mixin);
+        return cmd;
+    }
+}

server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverInstanceServer.java

@@ -16,7 +16,7 @@
  */
 package io.cloudbeaver.model.cli;
 
-import org.apache.commons.cli.CommandLine;
+
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
 import org.jkiss.dbeaver.model.cli.ApplicationInstanceServer;
@@ -25,20 +25,27 @@ import org.jkiss.dbeaver.model.cli.CLIProcessResult;
 import java.io.IOException;
 
 public class CloudBeaverInstanceServer extends ApplicationInstanceServer<ApplicationInstanceController> {
+    private final CloudBeaverCommandLine commandLine;
+
     public CloudBeaverInstanceServer() throws IOException {
         super(ApplicationInstanceController.class);
+        this.commandLine = new CloudBeaverCommandLine();
+    }
+
+    public CloudBeaverInstanceServer(@NotNull CloudBeaverCommandLine commandLine) throws IOException {
+        super(ApplicationInstanceController.class);
+        this.commandLine = commandLine;
     }
 
     @NotNull
     @Override
     public CLIProcessResult handleCommandLine(@NotNull String[] args) {
-        CommandLine cmd = CloudBeaverCommandLine.getInstance().getCommandLine(args);
         try {
-            return CloudBeaverCommandLine.getInstance().executeCommandLineCommands(
-                cmd,
+            return commandLine.executeCommandLineCommands(
                 this,
                 false,
-                false
+                false,
+                args
             );
         } catch (Exception e) {
             return new CLIProcessResult(CLIProcessResult.PostAction.ERROR, "Error executing command: " + e.getMessage());

server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverMixin.java

@@ -0,0 +1,34 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.cli;
+
+import org.jkiss.dbeaver.model.cli.model.NonExecutableOption;
+import picocli.CommandLine;
+
+/**
+ * CloudBeaver specific mixin options
+ */
+public class CloudBeaverMixin {
+    @NonExecutableOption
+    @CommandLine.Option(
+        names = {"-web-config"},
+        arity = "1",
+        hidden = true,
+        scope = CommandLine.ScopeType.INHERIT
+    )
+    private String webConfig;
+}

server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverTopLevelCommand.java

@@ -0,0 +1,46 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.cli;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
+import org.jkiss.dbeaver.model.cli.CLIContextImpl;
+import org.jkiss.dbeaver.model.cli.CLIRunMeta;
+import org.jkiss.dbeaver.model.cli.command.AbstractTopLevelCommand;
+import org.jkiss.dbeaver.model.cli.model.NonExecutableOption;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "cbvr", description = "CloudBeaver commands")
+public class CloudBeaverTopLevelCommand extends AbstractTopLevelCommand {
+    @NonExecutableOption
+    @CommandLine.Option(
+        names = {NOSPASH_OPTION},
+        hidden = true,
+        scope = CommandLine.ScopeType.INHERIT
+    )
+    private boolean noSplash;
+
+    protected CloudBeaverTopLevelCommand(
+        @Nullable ApplicationInstanceController controller,
+        @NotNull CLIContextImpl context,
+        @NotNull CLIRunMeta meta
+
+    ) {
+        super(controller, context, meta);
+    }
+}

server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF

@@ -3,21 +3,20 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.86.qualifier
-Bundle-Release-Date: 20251006
+Bundle-Version: 1.0.107.qualifier
+Bundle-Release-Date: 20260817
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,
  org.jkiss.dbeaver.model;visibility:=reexport,
- org.jkiss.dbeaver.model.cli;visibility:=reexport,
  org.jkiss.dbeaver.model.sm;visibility:=reexport,
  org.jkiss.dbeaver.model.event;visibility:=reexport,
  org.jkiss.dbeaver.model.nio;visibility:=reexport,
  org.jkiss.dbeaver.registry;visibility:=reexport,
  org.jkiss.dbeaver.net.ssh,
+ org.jkiss.bundle.logback;visibility:=reexport,
  org.jkiss.bundle.graphql;visibility:=reexport,
  org.jkiss.bundle.apache.dbcp,
- com.google.gson;visibility:=reexport,
  jakarta.servlet-api;bundle-version:="6.0.0";visibility:=reexport
 Export-Package: io.cloudbeaver,
  io.cloudbeaver.auth,
@@ -26,17 +25,21 @@ Export-Package: io.cloudbeaver,
  io.cloudbeaver.auth.provider.local,
  io.cloudbeaver.auth.provisioning,
  io.cloudbeaver.websocket,
+ io.cloudbeaver.websocket.event.client,
+ io.cloudbeaver.websocket.event.task,
  io.cloudbeaver.model,
+ io.cloudbeaver.model.api.annotation,
+ io.cloudbeaver.model.api.annotation.enums,
+ io.cloudbeaver.model.api.annotation.media,
+ io.cloudbeaver.model.api.annotation.responses,
+ io.cloudbeaver.model.api.annotation.tags,
  io.cloudbeaver.model.app,
  io.cloudbeaver.model.config,
  io.cloudbeaver.model.apilog,
- io.cloudbeaver.model.cli,
- io.cloudbeaver.model.events,
  io.cloudbeaver.model.fs,
  io.cloudbeaver.model.log,
  io.cloudbeaver.model.rm,
  io.cloudbeaver.model.rm.local,
- io.cloudbeaver.model.rm.lock,
  io.cloudbeaver.model.session,
  io.cloudbeaver.model.user,
  io.cloudbeaver.model.utils,

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle.properties

@@ -13,7 +13,7 @@ meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductName.
 meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductVersion.name=Security manager database product version
 
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Read-only connection
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Auto-commit
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommitMode.name = Auto-commit mode
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Keep-alive interval (seconds)
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Default schema
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Default catalog

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle_ru.properties

@@ -1,5 +1,5 @@
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Только для чтения
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Авто-коммит
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommitMode.name = Авто-коммит
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Интервал Keep-alive (в секундах)
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Схема по умолчанию
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Каталог по умолчанию

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle_vi.properties

@@ -1,4 +1,4 @@
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Kết nối chỉ đọc
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Tự động commit
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommitMode.name = Tự động commit
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Giữ kết nối (tính bằng giây)
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = Không tự động ngắt kết nối

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle_zh.properties

@@ -1,3 +1,3 @@
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = 自动提交
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommitMode.name = 自动提交
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = 保持连接 (秒)
 meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = 无自动断开连接

server/bundles/io.cloudbeaver.model/plugin.xml

@@ -25,4 +25,34 @@
                     label="Default secret controller" description="Default void secret controller"/>
     </extension>
 
+    <extension point="io.cloudbeaver.feature">
+        <feature id="ssh" label="SSH tunnels for databases" description="Enables SSH tunnels for secure database connections, allowing access to remote databases through encrypted channels" enabledByDefault="true"/>
+    </extension>
+
+
+    <extension point="org.jkiss.dbeaver.ws.event">
+        <event topicId="cb_session_task" id="cb_session_task_info_updated"
+               class="io.cloudbeaver.websocket.event.task.WSSessionTaskInfoEvent"/>
+
+        <event topicId="cb_session_task" id="cb_session_task_confirmation_request"
+               class="io.cloudbeaver.websocket.event.task.WSSessionTaskConfirmationRequestEvent"/>
+        <event topicId="cb_session_task" id="cb_session_task_query_confirmation_request"
+               class="io.cloudbeaver.websocket.event.task.WSSessionTaskQueryConfirmationRequestEvent"/>
+        <event topicId="cb_session_task" id="cb_session_task_query_params_confirmation_request"
+               class="io.cloudbeaver.websocket.event.task.WSSessionTaskQueryParamsConfirmationEvent"/>
+
+        <clientEvent id="cb_client_session_ping" class="io.cloudbeaver.websocket.event.client.WSSessionPingClientEvent"/>
+        <clientEvent id="cb_client_topic_subscribe" class="io.cloudbeaver.websocket.event.client.WSSubscribeOnTopicClientEvent"/>
+        <clientEvent id="cb_client_topic_unsubscribe"
+                     class="io.cloudbeaver.websocket.event.client.WSUnsubscribeFromTopicClientEvent"/>
+        <clientEvent id="cb_client_projects_active"
+                     class="io.cloudbeaver.websocket.event.client.WSUpdateActiveProjectsClientEvent"/>
+        <clientEvent id="cb_client_session_task_confirmation"
+                     class="io.cloudbeaver.websocket.event.client.WSSessionTaskConfirmationEvent"/>
+        <clientEvent id="cb_client_session_task_with_parameters_confirmation"
+                     class="io.cloudbeaver.websocket.event.client.WSSessionTaskWithParametersConfirmationEvent"/>
+        <clientEvent id="cb_client_cancel_action"
+                     class="io.cloudbeaver.websocket.event.client.WSSessionCancelActionClientEvent"/>
+    </extension>
+
 </plugin>

server/bundles/io.cloudbeaver.model/pom.xml

@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.model</artifactId>
-    <version>1.0.86-SNAPSHOT</version>
+    <version>1.0.107-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.java

@@ -32,6 +32,8 @@ public interface DBWConstants {
     String PERMISSION_SQL_RESULT_UPDATE = "sql-result-update";
     String PERMISSION_SQL_EXECUTE_QUERY = "sql-execute-query";
 
+    String PERMISSION_FS_RESOURCE_EDIT = "fs-resource-edit";
+
     String GLOBAL_PERMISSION_SCRIPT_EXECUTE = "permission.sql.script.execution";
     String GLOBAL_PERMISSION_DATA_EDITOR_IMPORT = "permission.data-editor.import";
     String GLOBAL_PERMISSION_DATA_EDITOR_EDITING = "permission.data-editor.editing";

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWebException.java

@@ -146,6 +146,8 @@ public class DBWebException extends DBException implements GraphQLError {
             } else {
                 return message;
             }
+        } else if (cause.getMessage() == null && cause.getCause() != null) {
+            return message + ":\n" + cause.getCause().getClass().getSimpleName();
         }
         if (CommonUtils.isEmpty(message)) {
             if (cause.getMessage() != null) {

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebConnectionConfigInputHandler.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package io.cloudbeaver;
 
 import io.cloudbeaver.model.WebConnectionConfig;
 import io.cloudbeaver.model.app.WebAppConfiguration;
+import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.utils.ServletAppUtils;
 import io.cloudbeaver.utils.WebDataSourceUtils;
 import org.jkiss.code.NotNull;
@@ -26,14 +27,17 @@ import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
+import org.jkiss.dbeaver.registry.DataSourcePreferenceStore;
 import org.jkiss.utils.CommonUtils;
 
 public class WebConnectionConfigInputHandler<T extends WebConnectionConfig, C extends DataSourceDescriptor> {
     private static final Log log = Log.getLog(WebConnectionConfigInputHandler.class);
     protected final T input;
     protected final DBPDataSourceRegistry registry;
+    protected final WebSession webSession;
 
-    public WebConnectionConfigInputHandler(@NotNull DBPDataSourceRegistry registry, T configInput) {
+    public WebConnectionConfigInputHandler(@NotNull WebSession webSession, @NotNull DBPDataSourceRegistry registry, T configInput) {
+        this.webSession = webSession;
         this.registry = registry;
         this.input = configInput;
     }
@@ -52,6 +56,7 @@ public class WebConnectionConfigInputHandler<T extends WebConnectionConfig, C ex
         }
 
         WebDataSourceUtils.saveAuthProperties(
+            webSession.getProgressMonitor(),
             newDataSource,
             newDataSource.getConnectionConfiguration(),
             input.getCredentials(),
@@ -72,21 +77,24 @@ public class WebConnectionConfigInputHandler<T extends WebConnectionConfig, C ex
         }
 
         dataSource.setFolder(input.getFolder() != null ? registry.getFolder(input.getFolder()) : null);
-        if (input.isDefaultAutoCommit() != null) {
-            dataSource.setDefaultAutoCommit(input.isDefaultAutoCommit());
-        }
+        dataSource.getConnectionConfiguration().getBootstrap().setDefaultAutoCommit(input.isDefaultAutoCommit());
         WebDataSourceUtils.setConnectionConfiguration(
             dataSource.getDriver(),
             dataSource.getConnectionConfiguration(),
             input
         );
         WebDataSourceUtils.saveAuthProperties(
+            webSession.getProgressMonitor(),
             dataSource,
             dataSource.getConnectionConfiguration(),
             input.getCredentials(),
             input.isSaveCredentials(),
             input.isSharedCredentials()
         );
+        dataSource.setConnectionReadOnly(input.isReadOnly());
+        DataSourcePreferenceStore preferenceStore = dataSource.getPreferenceStore();
+        preferenceStore.clear();
+        preferenceStore.setProperties(input.getDefaultUserPreferences());
     }
 
     @NotNull

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceConnectEventListener.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package io.cloudbeaver;
 
 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.utils.WebEventUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBPEvent;
@@ -36,7 +37,7 @@ public class WebDataSourceConnectEventListener implements DBPEventListener {
     }
 
     @Override
-    public void handleDataSourceEvent(DBPEvent event) {
+    public void handleDataSourceEvent(@NotNull DBPEvent event) {
         if (!(event.getObject() instanceof DBPDataSourceContainer container)) {
             return;
         }
@@ -46,7 +47,7 @@ public class WebDataSourceConnectEventListener implements DBPEventListener {
                 new WSDataSourceConnectEvent(
                     container.getProject().getId(),
                     container.getId(),
-                    webSession.getSessionId(),
+                    WebEventUtils.getSmSessionId(webSession),
                     webSession.getUserId()
                 )
             );

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebGlobalProjectRegistryProxy.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.net.DBWNetworkProfile;
+import org.jkiss.dbeaver.model.net.DBWNetworkProfileManager;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
@@ -258,28 +259,12 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
         dataSourceRegistry.removeSavedFilter(filterName);
     }
 
-    @Nullable
-    @Override
-    public DBWNetworkProfile getNetworkProfile(@Nullable String source, @NotNull String name) {
-        return dataSourceRegistry.getNetworkProfile(source, name);
-    }
-
     @NotNull
     @Override
-    public List<DBWNetworkProfile> getNetworkProfiles() {
+    public DBWNetworkProfileManager getNetworkProfiles() {
         return dataSourceRegistry.getNetworkProfiles();
     }
 
-    @Override
-    public void updateNetworkProfile(@NotNull DBWNetworkProfile profile) {
-        dataSourceRegistry.updateNetworkProfile(profile);
-    }
-
-    @Override
-    public void removeNetworkProfile(@NotNull DBWNetworkProfile profile) {
-        dataSourceRegistry.removeNetworkProfile(profile);
-    }
-
     @Nullable
     @Override
     public DBAAuthProfile getAuthProfile(@NotNull String id) {
@@ -377,6 +362,12 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
         return dataSourceRegistry.getPreferenceStore();
     }
 
+    @Override
+    public void initializeDataSources() {
+        dataSourceRegistry.initializeDataSources();
+    }
+
+    @Nullable
     @Override
     public DataSourceParseResults loadDataSources(
         @NotNull List<DBPDataSourceConfigurationStorage> storages,
@@ -392,6 +383,7 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
         dataSourceRegistry.saveDataSources();
     }
 
+    @NotNull
     @Override
     public DataSourceConfigurationManager getConfigurationManager() {
         return dataSourceRegistry.getConfigurationManager();
@@ -407,12 +399,12 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
     }
 
     @Override
-    public void persistSecrets(DBSSecretController secretController) throws DBException {
+    public void persistSecrets(@NotNull DBSSecretController secretController) throws DBException {
         dataSourceRegistry.persistSecrets(secretController);
     }
 
     @Override
-    public void resolveSecrets(DBSSecretController secretController) throws DBException {
+    public void resolveSecrets(@NotNull DBSSecretController secretController) throws DBException {
         dataSourceRegistry.resolveSecrets(secretController);
     }
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebSessionGlobalProjectImpl.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBPEvent;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
+import org.jkiss.dbeaver.model.auth.SMObjectType;
 import org.jkiss.dbeaver.model.rm.RMProject;
-import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.model.security.user.SMObjectPermissions;
 
 import java.util.Set;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebSessionProjectImpl.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,53 +24,46 @@ import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.DBPAdaptable;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.DBPObjectSettingsProvider;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistryCache;
+import org.jkiss.dbeaver.model.auth.SMObjectType;
 import org.jkiss.dbeaver.model.navigator.DBNModel;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.rm.RMUtils;
-import org.jkiss.dbeaver.model.security.SMObjectType;
+import org.jkiss.dbeaver.model.security.SMControllerUtils;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;
+import org.jkiss.dbeaver.registry.project.BaseProjectSettings;
 import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
 import org.jkiss.utils.CommonUtils;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.*;
 
-public class WebSessionProjectImpl extends WebProjectImpl {
+public class WebSessionProjectImpl extends WebProjectImpl implements DBPAdaptable {
     private static final Log log = Log.getLog(WebSessionProjectImpl.class);
+
     protected final WebSession webSession;
     private final Map<String, WebConnectionInfo> connections = new HashMap<>();
-    private final Map<String, Object> projectSettings = new ConcurrentHashMap<>();
+    private final BaseProjectSettings projectSettings;
     private boolean registryIsLoaded = false;
 
     public WebSessionProjectImpl(
         @NotNull WebSession webSession,
         @NotNull RMProject project
     ) {
-        super(
-            webSession.getWorkspace(),
-            webSession.getRmController(),
-            webSession.getSessionContext(),
-            project,
-            webSession.getUserPreferenceStore(),
-            RMUtils.getProjectPath(project)
-        );
-        this.webSession = webSession;
+        this(webSession, project, null);
     }
 
     public WebSessionProjectImpl(
         @NotNull WebSession webSession,
         @NotNull RMProject project,
-        @NotNull Path path
+        @Nullable Path path
     ) {
         super(
             webSession.getWorkspace(),
@@ -78,17 +71,52 @@ public class WebSessionProjectImpl extends WebProjectImpl {
             webSession.getSessionContext(),
             project,
             webSession.getUserPreferenceStore(),
-            path
+            path == null ? RMUtils.getProjectPath(project) : path
         );
         this.webSession = webSession;
+        this.projectSettings = new BaseProjectSettings(this) {
+            @NotNull
+            @Override
+            protected Map<SMObjectType, Map<String, Map<String, String>>> loadAllProjectSettings() throws DBException {
+                if (webSession.getUser() == null) {
+                    return new LinkedHashMap<>();
+                }
+                return SMControllerUtils.getObjectSettingsMap(WebSessionProjectImpl.this, webSession.getSecurityController());
+            }
+
+            @Override
+            protected void saveProjectSettings(
+                @NotNull SMObjectType objectType,
+                @NotNull String objectId,
+                @NotNull Map<String, String> settings
+            ) throws DBException {
+                if (webSession.getUserContext().isNonAnonymousUserAuthorizedInSM()) {
+                    webSession.getSecurityController().setObjectSettings(getId(), objectType, objectId, settings);
+                }
+            }
+
+        };
     }
 
-    @Nullable
+    @NotNull
+    public BaseProjectSettings getProjectSettings() {
+        return projectSettings;
+    }
+
+    @NotNull
     @Override
     public DBNModel getNavigatorModel() {
         return webSession.getNavigatorModel();
     }
 
+    @Override
+    public <T> T getAdapter(@NotNull Class<T> adapter) {
+        if (adapter == DBPObjectSettingsProvider.class) {
+            return adapter.cast(projectSettings);
+        }
+        return null;
+    }
+
     @NotNull
     @Override
     protected DBPDataSourceRegistry createDataSourceRegistry() {
@@ -190,6 +218,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
      *
      * @return connections from cache.
      */
+    @NotNull
     public List<WebConnectionInfo> getConnections() {
         if (!registryIsLoaded) {
             addDataSourcesToCache();
@@ -223,14 +252,14 @@ public class WebSessionProjectImpl extends WebProjectImpl {
                 }
                 case WSDataSourceEvent.UPDATED ->  {
                     if (event.getProperty() == WSDataSourceProperty.CONFIGURATION) {
-                        WebDataSourceUtils.disconnectDataSource(webSession, ds);
+                        WebDataSourceUtils.disconnectDataSource(webSession, ds, true);
                     }
                     if (event.getProperty() != WSDataSourceProperty.INTERNAL) {
                         sendDataSourceUpdatedEvent = true;
                     }
                 }
                 case WSDataSourceEvent.DELETED -> {
-                    WebDataSourceUtils.disconnectDataSource(webSession, ds);
+                    WebDataSourceUtils.disconnectDataSource(webSession, ds, false);
                     if (registry instanceof DBPDataSourceRegistryCache dsrc) {
                         dsrc.removeDataSourceFromList(ds);
                     }
@@ -244,20 +273,6 @@ public class WebSessionProjectImpl extends WebProjectImpl {
         return sendDataSourceUpdatedEvent;
     }
 
-    public void refreshProjectSettings() throws DBException {
-        if (webSession.getUser() == null) {
-            projectSettings.clear();
-            return;
-        }
-        Map<String, Object> loadedSettings = webSession.getSecurityController().getObjectSettings(
-            getId(),
-            SMObjectType.project,
-            null
-        );
-        projectSettings.clear();
-        projectSettings.putAll(loadedSettings);
-    }
-
     @NotNull
     public WebConnectionInfo createConnectionInfo(@NotNull DBPDataSourceContainer dataSourceDescriptor) {
         return new WebConnectionInfo(webSession, dataSourceDescriptor);
@@ -268,7 +283,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
         if (CommonUtils.isEmpty(configMap)) {
             throw new DBWebException("Connection configuration parameters are missing");
         }
-        DBPDataSourceContainer newDataSource = getDataSourceContainerFromInput(configMap);
+        DBPDataSourceContainer newDataSource = getDataSourceContainerFromInput(getConnectionConfigInput(configMap));
         return addDataSourceToProject(newDataSource);
     }
 
@@ -302,7 +317,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
         webSession.addInfoMessage("Update connection - " + WebDataSourceUtils.getConnectionContainerInfo(dataSource));
 
         DBPDataSourceRegistry registry = getDataSourceRegistry();
-        getInputConfigHandler(configMap).updateDataSource(dataSource);
+        getInputConfigHandler(config).updateDataSource(dataSource);
         connectionInfo.setCredentialsSavedInSession(null);
         try {
             registry.updateDataSource(dataSource);
@@ -330,26 +345,23 @@ public class WebSessionProjectImpl extends WebProjectImpl {
     @NotNull
     private WebConnectionInfo closeAndDeleteConnection(@NotNull WebConnectionInfo connectionInfo) throws DBWebException {
         DBPDataSourceContainer dataSourceContainer = connectionInfo.getDataSourceContainer();
-        boolean disconnected = WebDataSourceUtils.disconnectDataSource(webSession, dataSourceContainer);
+        WebDataSourceUtils.disconnectDataSource(webSession, dataSourceContainer, false);
         DBPDataSourceRegistry registry = getDataSourceRegistry();
         registry.removeDataSource(dataSourceContainer);
-        try {
-            registry.checkForErrors();
-        } catch (DBException e) {
-            try {
-                registry.addDataSource(dataSourceContainer);
-            } catch (DBException ex) {
-                log.error("Error re-adding after delete attempt", e);
-            }
-            throw new DBWebException("Failed to delete connection", e);
-        }
         removeConnection(dataSourceContainer);
         return connectionInfo;
     }
 
     @NotNull
-    public DataSourceDescriptor getDataSourceContainerFromInput(@NotNull Map<String, Object> configMap) throws DBWebException {
-        return getInputConfigHandler(configMap).createDataSourceContainer();
+    public DataSourceDescriptor getDataSourceContainerFromInput(@NotNull WebConnectionConfig configInput) throws DBWebException {
+        return getInputConfigHandler(configInput).createDataSourceContainer();
+    }
+
+    public void updateDataSourceContainerFromInput(
+        @NotNull WebConnectionConfig configInput,
+        @NotNull DataSourceDescriptor dataSource
+    ) throws DBWebException {
+        getInputConfigHandler(configInput).updateDataSource(dataSource);
     }
 
     @NotNull
@@ -358,8 +370,8 @@ public class WebSessionProjectImpl extends WebProjectImpl {
     }
 
     @NotNull
-    protected WebConnectionConfigInputHandler getInputConfigHandler(@NotNull Map<String, Object> configMap) {
-        return new WebConnectionConfigInputHandler<>(getDataSourceRegistry(), getConnectionConfigInput(configMap));
+    protected WebConnectionConfigInputHandler getInputConfigHandler(@NotNull WebConnectionConfig configInput) {
+        return new WebConnectionConfigInputHandler<>(webSession, getDataSourceRegistry(), configInput);
     }
 
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderExternal.java

@@ -69,9 +69,20 @@ public interface SMAuthProviderExternal<AUTH_SESSION extends SMSession> extends
         @NotNull WebUser user,
         boolean selfIdentity) throws DBException;
 
+    /**
+     * Whether a user that is not found should be provisioned (auto-created) on external login.
+     */
+    default boolean isAutoUserProvisioningEnabled(@Nullable SMAuthProviderCustomConfiguration providerConfig) {
+        return true;
+    }
+
     /**
      * Make some post authentication actions
      */
     default void postAuthentication() {}
 
+    @Override
+    default boolean supportsOpeningSessionAsChild() {
+        return true;
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/AbstractCancelableJob.java

@@ -0,0 +1,40 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.utils.WebEventUtils;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.runtime.AbstractJob;
+
+public abstract class AbstractCancelableJob extends AbstractJob implements CustomCancelableJob {
+    protected AbstractCancelableJob(@NotNull String name) {
+        super(name);
+    }
+
+    @Override
+    public void cancelJob(@NotNull WebSession webSession, @NotNull WebAsyncTaskInfo taskInfo) {
+        cancelJob(webSession, taskInfo, "Canceled by the user");
+    }
+
+    public void cancelJob(@NotNull WebSession webSession, @NotNull WebAsyncTaskInfo taskInfo, @NotNull String errorMessage) {
+        taskInfo.setRunning(false);
+        taskInfo.setJobError(new DBException(errorMessage));
+        WebEventUtils.sendAsyncTaskEvent(webSession, taskInfo);
+    }
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/AutoCommitMode.java

@@ -0,0 +1,62 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.utils.CommonUtils;
+
+public enum AutoCommitMode {
+    DEFAULT("Default", null),
+    AUTO_COMMIT("Auto commit", true),
+    MANUAL_COMMIT("Manual commit", false);
+
+    private final String title;
+    private final Boolean value;
+
+    AutoCommitMode(@NotNull String title, @Nullable Boolean value) {
+        this.title = title;
+        this.value = value;
+    }
+
+    @NotNull
+    @Override
+    public String toString() {
+        return title;
+    }
+
+    @Nullable
+    public Boolean getValue() {
+        return value;
+    }
+
+    @NotNull
+    public static AutoCommitMode fromValue(@Nullable Boolean value) {
+        if (value == null) {
+            return DEFAULT;
+        }
+        return value ? AUTO_COMMIT : MANUAL_COMMIT;
+    }
+
+    @Nullable
+    public static Boolean from(@Nullable String mode) {
+        if (CommonUtils.isEmpty(mode)) {
+            return null;
+        }
+        return valueOf(mode).getValue();
+    }
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/BaseDatasourceAccessCheckHandler.java

@@ -1,3 +1,19 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.cloudbeaver.model;
 
 import org.jkiss.code.NotNull;
@@ -10,7 +26,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 public abstract class BaseDatasourceAccessCheckHandler implements DBPDataSourceHandler {
     @Override
     public void beforeConnect(
-        DBRProgressMonitor monitor,
+        @NotNull DBRProgressMonitor monitor,
         @NotNull DBPDataSourceContainer dataSourceContainer
     ) throws DBException {
         if (isDriverDisabled(dataSourceContainer.getDriver())) {
@@ -20,7 +36,7 @@ public abstract class BaseDatasourceAccessCheckHandler implements DBPDataSourceH
 
     @Override
     public void beforeDisconnect(
-        DBRProgressMonitor monitor,
+        @NotNull DBRProgressMonitor monitor,
         @NotNull DBPDataSourceContainer dataSourceContainer
     ) throws DBException {
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebBasicEnumObjectInfo.java

@@ -0,0 +1,50 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import org.jkiss.code.NotNull;
+
+public class WebBasicEnumObjectInfo {
+
+    @NotNull
+    private String displayName;
+    @NotNull
+    private String value;
+
+    public WebBasicEnumObjectInfo(@NotNull String displayName, @NotNull String value) {
+        this.displayName = displayName;
+        this.value = value;
+    }
+
+    @NotNull
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(@NotNull String displayName) {
+        this.displayName = displayName;
+    }
+
+    @NotNull
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(@NotNull String value) {
+        this.value = value;
+    }
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionConfig.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.meta.Property;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -42,7 +43,7 @@ public class WebConnectionConfig {
     private String databaseName;
     private String url;
 
-    private int keepAliveInterval;
+    private Integer keepAliveInterval;
 
     private String name;
     private String description;
@@ -53,17 +54,20 @@ public class WebConnectionConfig {
 
     private String authModelId;
     private Map<String, Object> credentials;
-    private boolean saveCredentials;
-    private boolean sharedCredentials;
+    private Boolean saveCredentials;
+    private Boolean sharedCredentials;
     private Map<String, Object> mainPropertyValues;
     private Map<String, Object> expertSettingsValues;
     private Map<String, Object> providerProperties;
     private List<WebNetworkHandlerConfigInput> networkHandlersConfig;
     private DBPDriverConfigurationType configurationType;
     private String selectedSecretId;
-    private boolean defaultAutoCommit;
+    private Boolean defaultAutoCommit;
     private String defaultCatalogName;
     private String defaultSchemaName;
+    private String connectionType;
+    @NotNull
+    private Map<String, String> defaultUserPreferences = new LinkedHashMap<>();
 
     public WebConnectionConfig() {
     }
@@ -99,8 +103,14 @@ public class WebConnectionConfig {
             expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_KEEP_ALIVE_INTERVAL, -1);
         readOnly = JSONUtils.getBoolean(
             expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_READ_ONLY);
-        defaultAutoCommit = JSONUtils.getBoolean(
-            expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_AUTO_COMMIT, true);
+
+        if (expertSettingsValues != null) {
+            defaultAutoCommit = AutoCommitMode.from(
+                JSONUtils.getString(expertSettingsValues, WebExpertSettingsProperties.PROP_AUTO_COMMIT_MODE));
+        } else {
+            defaultAutoCommit = JSONUtils.getBoolean(params, WebExpertSettingsProperties.PROP_AUTO_COMMIT, true);
+        }
+
         defaultCatalogName = JSONUtils.getString(
             expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_DEFAULT_CATALOG);
         defaultSchemaName = JSONUtils.getString(
@@ -111,10 +121,13 @@ public class WebConnectionConfig {
         String configType = JSONUtils.getString(params, "configurationType");
         configurationType = configType == null ? null : DBPDriverConfigurationType.valueOf(configType);
 
+        Map<String, Object> stringObjectUserPrefMap = JSONUtils.getObject(params, "defaultUserPreferences");
+        stringObjectUserPrefMap.forEach((key, value) -> defaultUserPreferences.put(key, value.toString()));
         networkHandlersConfig = new ArrayList<>();
         for (Map<String, Object> nhc : JSONUtils.getObjectList(params, "networkHandlersConfig")) {
             networkHandlersConfig.add(new WebNetworkHandlerConfigInput(nhc));
         }
+        connectionType = JSONUtils.getString(params, "connectionType");
     }
 
     @Property
@@ -122,102 +135,178 @@ public class WebConnectionConfig {
         return connectionId;
     }
 
+    public void setConnectionId(String connectionId) {
+        this.connectionId = connectionId;
+    }
+
     @Property
     public String getDriverId() {
         return driverId;
     }
 
+    public void setDriverId(String driverId) {
+        this.driverId = driverId;
+    }
+
     @Property
     public boolean isReadOnly() {
         return readOnly;
     }
 
+    public void setReadOnly(boolean readOnly) {
+        this.readOnly = readOnly;
+    }
+
     @Property
     public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     @Property
     public String getDescription() {
         return description;
     }
 
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     @Property
     public String getFolder() {
         return folder;
     }
 
+    public void setFolder(String folder) {
+        this.folder = folder;
+    }
+
     @Property
     public String getHost() {
         return host;
     }
 
+    public void setHost(String host) {
+        this.host = host;
+    }
+
     @Property
     public String getPort() {
         return port;
     }
 
+    public void setPort(String port) {
+        this.port = port;
+    }
+
     @Property
     public String getServerName() {
         return serverName;
     }
 
+    public void setServerName(String serverName) {
+        this.serverName = serverName;
+    }
+
     @Property
     public String getDatabaseName() {
         return databaseName;
     }
 
+    public void setDatabaseName(String databaseName) {
+        this.databaseName = databaseName;
+    }
+
     @Property
     public String getUrl() {
         return url;
     }
 
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
     @Property
     public Map<String, Object> getProperties() {
         return properties;
     }
 
+    public void setProperties(Map<String, Object> properties) {
+        this.properties = properties;
+    }
+
     @Property
     public String getUserName() {
         return userName;
     }
 
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
     @Property
     public String getUserPassword() {
         return userPassword;
     }
 
+    public void setUserPassword(String userPassword) {
+        this.userPassword = userPassword;
+    }
+
     @Property
     public String getAuthModelId() {
         return authModelId;
     }
 
+    public void setAuthModelId(String authModelId) {
+        this.authModelId = authModelId;
+    }
+
     @Property
     public DBPDriverConfigurationType getConfigurationType() {
         return configurationType;
     }
 
+    public void setConfigurationType(DBPDriverConfigurationType configurationType) {
+        this.configurationType = configurationType;
+    }
+
     @Property
     public Map<String, Object> getCredentials() {
         return credentials;
     }
 
+    public void setCredentials(Map<String, Object> credentials) {
+        this.credentials = credentials;
+    }
+
     public List<WebNetworkHandlerConfigInput> getNetworkHandlersConfig() {
         return networkHandlersConfig;
     }
 
+    public void setNetworkHandlersConfig(List<WebNetworkHandlerConfigInput> networkHandlersConfig) {
+        this.networkHandlersConfig = networkHandlersConfig;
+    }
+
     @Property
     public boolean isSaveCredentials() {
         return saveCredentials;
     }
 
+    public void setSaveCredentials(boolean saveCredentials) {
+        this.saveCredentials = saveCredentials;
+    }
+
     @Property
     public boolean isSharedCredentials() {
         return sharedCredentials;
     }
 
-    public void setSaveCredentials(boolean saveCredentials) {
-        this.saveCredentials = saveCredentials;
+    public void setSharedCredentials(boolean sharedCredentials) {
+        this.sharedCredentials = sharedCredentials;
     }
 
     @Property
@@ -225,38 +314,88 @@ public class WebConnectionConfig {
         return mainPropertyValues;
     }
 
+    public void setMainPropertyValues(Map<String, Object> mainPropertyValues) {
+        this.mainPropertyValues = mainPropertyValues;
+    }
+
     @Property
     public Map<String, Object> getExpertSettingsValues() {
         return expertSettingsValues;
     }
 
+    public void setExpertSettingsValues(Map<String, Object> expertSettingsValues) {
+        this.expertSettingsValues = expertSettingsValues;
+    }
+
     @Property
     public Map<String, Object> getProviderProperties() {
         return providerProperties;
     }
 
+    public void setProviderProperties(Map<String, Object> providerProperties) {
+        this.providerProperties = providerProperties;
+    }
+
     @Property
     public Integer getKeepAliveInterval() {
         return keepAliveInterval;
     }
 
+    public void setKeepAliveInterval(int keepAliveInterval) {
+        this.keepAliveInterval = keepAliveInterval;
+    }
+
     @Property
     public Boolean isDefaultAutoCommit() {
         return defaultAutoCommit;
     }
 
+    public void setDefaultAutoCommit(boolean defaultAutoCommit) {
+        this.defaultAutoCommit = defaultAutoCommit;
+    }
+
     @Nullable
     public String getSelectedSecretId() {
         return selectedSecretId;
     }
 
+    public void setSelectedSecretId(String selectedSecretId) {
+        this.selectedSecretId = selectedSecretId;
+    }
+
     @Property
     public String getDefaultCatalogName() {
         return defaultCatalogName;
     }
 
+    public void setDefaultCatalogName(String defaultCatalogName) {
+        this.defaultCatalogName = defaultCatalogName;
+    }
+
     @Property
     public String getDefaultSchemaName() {
         return defaultSchemaName;
     }
+
+    public void setDefaultSchemaName(String defaultSchemaName) {
+        this.defaultSchemaName = defaultSchemaName;
+    }
+
+    @NotNull
+    public Map<String, String> getDefaultUserPreferences() {
+        return defaultUserPreferences;
+    }
+
+    public void setDefaultUserPreferences(@NotNull Map<String, String> defaultUserPreferences) {
+        this.defaultUserPreferences = defaultUserPreferences;
+    }
+
+    @Nullable
+    public String getConnectionType() {
+        return connectionType;
+    }
+
+    public void setConnectionType(@Nullable String connectionType) {
+        this.connectionType = connectionType;
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.WebProjectImpl;
 import io.cloudbeaver.model.app.BaseWebAppConfiguration;
 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.server.CBConstants;
 import io.cloudbeaver.service.security.SMUtils;
 import io.cloudbeaver.service.sql.WebDataFormat;
 import io.cloudbeaver.utils.CBModelConstants;
@@ -38,12 +39,15 @@ import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
 import org.jkiss.dbeaver.model.impl.auth.AuthModelDatabaseNative;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.navigator.DBNBrowseSettings;
-import org.jkiss.dbeaver.model.navigator.DBNDataSource;
+import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
+import org.jkiss.dbeaver.model.navigator.DBNUtils;
+import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
 import org.jkiss.dbeaver.model.rm.RMConstants;
 import org.jkiss.dbeaver.model.rm.RMProjectPermission;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableParametrized;
+import org.jkiss.dbeaver.registry.DataSourcePreferenceStore;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerDescriptor;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -59,7 +63,6 @@ import java.util.stream.Collectors;
 public class WebConnectionInfo {
 
     private static final Log log = Log.getLog(WebConnectionInfo.class);
-    public static final String SECURED_VALUE = "********";
 
     private static final String FEATURE_HAS_TOOLS = "hasTools";
     private static final String FEATURE_CONNECTED = "connected";
@@ -127,7 +130,7 @@ public class WebConnectionInfo {
         if (canViewReadOnlyConnections()) {
             return dataSourceContainer.getConnectionConfiguration().getHostName();
         }
-        return SECURED_VALUE;
+        return CBConstants.SECURED_VALUE;
     }
 
     @Property
@@ -135,7 +138,7 @@ public class WebConnectionInfo {
         if (canViewReadOnlyConnections()) {
             return dataSourceContainer.getConnectionConfiguration().getHostPort();
         }
-        return SECURED_VALUE;
+        return CBConstants.SECURED_VALUE;
     }
 
     @Property
@@ -148,7 +151,7 @@ public class WebConnectionInfo {
         if (canViewReadOnlyConnections()) {
             return dataSourceContainer.getConnectionConfiguration().getDatabaseName();
         }
-        return SECURED_VALUE;
+        return CBConstants.SECURED_VALUE;
     }
 
     @Property
@@ -156,7 +159,7 @@ public class WebConnectionInfo {
         if (canViewReadOnlyConnections()) {
             return dataSourceContainer.getConnectionConfiguration().getUrl();
         }
-        return SECURED_VALUE;
+        return CBConstants.SECURED_VALUE;
     }
 
     @Property
@@ -211,7 +214,8 @@ public class WebConnectionInfo {
 
     @Property
     public String getNodePath() {
-        return DBNDataSource.makeDataSourceItemPath(dataSourceContainer);
+        DBNDatabaseNode dsNode = DBNUtils.getNodeByObject(dataSourceContainer);
+        return dsNode == null ? null : dsNode.getNodeUri();
     }
 
     @Property
@@ -252,6 +256,7 @@ public class WebConnectionInfo {
     }
 
     @Property
+    @NotNull
     public String[] getFeatures() {
         List<String> features = new ArrayList<>();
 
@@ -281,11 +286,29 @@ public class WebConnectionInfo {
     }
 
     @Property
+    @NotNull
     public DBNBrowseSettings getNavigatorSettings() {
         return dataSourceContainer.getNavigatorSettings();
     }
 
     @Property
+    @NotNull
+    public DBNBrowseSettings getDefaultNavigatorSettings() {
+        return dataSourceContainer.getNavigatorSettings().getOriginalSettings();
+    }
+
+    @Property
+    @NotNull
+    public Map<String, String> getDefaultUserPreferences() {
+        DBPPreferenceStore preferenceStore = dataSourceContainer.getPreferenceStore();
+        if (preferenceStore instanceof DataSourcePreferenceStore dataSourcePreferenceStore) {
+            return dataSourcePreferenceStore.getProperties();
+        }
+        return Collections.emptyMap();
+    }
+
+    @Property
+    @NotNull
     public List<WebDataFormat> getSupportedDataFormats() {
         List<WebDataFormat> formats = new ArrayList<>();
         formats.add(WebDataFormat.resultset);
@@ -300,11 +323,13 @@ public class WebConnectionInfo {
     }
 
     @Property
+    @NotNull
     public WebConnectionOriginInfo getOrigin() {
         return new WebConnectionOriginInfo(session, dataSourceContainer, dataSourceContainer.getOrigin());
     }
 
     @Property
+    @NotNull
     public DBPDriverConfigurationType getConfigurationType() {
         DBPDriverConfigurationType configurationType = dataSourceContainer.getConnectionConfiguration().getConfigurationType();
         if (configurationType == null) {
@@ -330,15 +355,27 @@ public class WebConnectionInfo {
     }
 
     @Property
+    @NotNull
     public String getAuthModel() {
         String authModelId = dataSourceContainer.getConnectionConfiguration().getAuthModelId();
         if (CommonUtils.isEmpty(authModelId)) {
             authModelId = AuthModelDatabaseNative.ID;
         }
+
+        // Patch auth model
+        DBPAuthModelDescriptor authModel = DBWorkbench.getPlatform().getDataSourceProviderRegistry().getAuthModel(authModelId);
+        if (authModel != null) {
+            DBPAuthModelDescriptor amReplace = authModel.getReplacedBy(dataSourceContainer.getDriver());
+            if (amReplace != null && amReplace != authModel) {
+                return amReplace.getId();
+            }
+        }
+
         return authModelId;
     }
 
     @Property
+    @NotNull
     public WebPropertyInfo[] getAuthProperties() {
         String authModelId = getAuthModel();
         DBPAuthModelDescriptor authModel = DBWorkbench.getPlatform().getDataSourceProviderRegistry().getAuthModel(authModelId);
@@ -361,6 +398,7 @@ public class WebConnectionInfo {
     }
 
     @Property
+    @NotNull
     public List<WebNetworkHandlerConfig> getNetworkHandlersConfig() {
         var registry = NetworkHandlerRegistry.getInstance();
         return dataSourceContainer.getConnectionConfiguration()
@@ -375,20 +413,23 @@ public class WebConnectionInfo {
     }
 
     @Property
+    @Nullable
     public Map<String, Object> getCredentials() {
         //dataSourceContainer.getConnectionConfiguration().getCredentialsProvider().getCredentials();
         return null;
     }
 
+    @Nullable
     public Map<String, Object> getSavedAuthProperties() {
         return savedAuthProperties;
     }
 
+    @Nullable
     public List<WebNetworkHandlerConfigInput> getSavedNetworkCredentials() {
         return savedNetworkCredentials;
     }
 
-    public void setSavedCredentials(Map<String, Object> authProperties, List<WebNetworkHandlerConfigInput> networkCredentials) {
+    public void setSavedCredentials(@Nullable Map<String, Object> authProperties, @Nullable List<WebNetworkHandlerConfigInput> networkCredentials) {
         this.savedAuthProperties = authProperties;
         this.savedNetworkCredentials = networkCredentials;
     }
@@ -413,6 +454,7 @@ public class WebConnectionInfo {
     }
 
     @Property
+    @NotNull
     public Map<String, String> getMainPropertyValues() {
         Map<String, String> mainProperties = new LinkedHashMap<>();
         mainProperties.put(DBConstants.PROP_HOST, getHost());
@@ -425,7 +467,7 @@ public class WebConnectionInfo {
     @Property
     public Map<String, Object> getExpertSettingsValues() {
         Map<String, Object> expertSettings = new LinkedHashMap<>();
-        expertSettings.put(WebExpertSettingsProperties.PROP_AUTO_COMMIT, isAutocommit());
+        expertSettings.put(WebExpertSettingsProperties.PROP_AUTO_COMMIT_MODE, AutoCommitMode.fromValue(isAutocommit()));
         expertSettings.put(WebExpertSettingsProperties.PROP_KEEP_ALIVE_INTERVAL, getKeepAliveInterval());
         expertSettings.put(WebExpertSettingsProperties.PROP_READ_ONLY, isReadOnly());
         expertSettings.put(WebExpertSettingsProperties.PROP_DEFAULT_CATALOG, getDefaultCatalogName());
@@ -468,7 +510,7 @@ public class WebConnectionInfo {
         return dataSourceContainer.getRequiredExternalAuth();
     }
 
-    private boolean hasProjectPermission(RMProjectPermission projectPermission) {
+    private boolean hasProjectPermission(@NotNull RMProjectPermission projectPermission) {
         DBPProject project = dataSourceContainer.getProject();
         if (!(project instanceof WebProjectImpl webProject)) {
             return false;
@@ -499,27 +541,27 @@ public class WebConnectionInfo {
     }
 
     @Property
-    public boolean isAutocommit() {
-        Boolean isAutoCommit = dataSourceContainer.getConnectionConfiguration().getBootstrap().getDefaultAutoCommit();
-        if (isAutoCommit == null) {
-            return true;
-        }
-        return isAutoCommit;
+    @Nullable
+    public Boolean isAutocommit() {
+        return dataSourceContainer.getConnectionConfiguration().getBootstrap().getDefaultAutoCommit();
     }
 
     @Property
+    @Nullable
     public String getDefaultCatalogName() {
         DBPConnectionConfiguration connectionConfiguration = dataSourceContainer.getConnectionConfiguration();
         return connectionConfiguration.getBootstrap().getDefaultCatalogName();
     }
 
     @Property
+    @Nullable
     public String getDefaultSchemaName() {
         DBPConnectionConfiguration connectionConfiguration = dataSourceContainer.getConnectionConfiguration();
         return connectionConfiguration.getBootstrap().getDefaultSchemaName();
     }
 
     @Property
+    @NotNull
     public List<WebSecretInfo> getSharedSecrets() throws DBException {
         return dataSourceContainer.listSharedCredentials()
             .stream()
@@ -527,8 +569,8 @@ public class WebConnectionInfo {
             .collect(Collectors.toList());
     }
 
-    @NotNull
     @Property
+    @NotNull
     public List<String> getTools() {
         if (!session.hasPermission(RMConstants.PERMISSION_DATABASE_DEVELOPER)) {
             return List.of();
@@ -541,10 +583,25 @@ public class WebConnectionInfo {
         return tools;
     }
 
+    @NotNull
+    public String getConnectionType() {
+        return dataSourceContainer.getConnectionConfiguration().getConnectionType().getId();
+    }
+
     /**
      * Updates param that checks whether credentials were saved only in session.
      */
     public void setCredentialsSavedInSession(@Nullable Boolean credentialsSavedInSession) {
         this.credentialsSavedInSession = credentialsSavedInSession;
     }
+
+    /**
+     * Database-dependent driver configuration used to drive data import
+     */
+    @Property
+    @NotNull
+    public WebDriverConfiguration getDriverConfiguration() {
+        return new WebDriverConfiguration(dataSourceContainer);
+    }
+
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebDictionaryValueInfo.java

@@ -0,0 +1,58 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.meta.Property;
+
+/**
+ * Generic id/name/description dictionary value.
+ */
+public class WebDictionaryValueInfo {
+
+    @NotNull
+    private final String id;
+    @NotNull
+    private final String name;
+    @Nullable
+    private final String description;
+
+    public WebDictionaryValueInfo(@NotNull String id, @NotNull String name, @Nullable String description) {
+        this.id = id;
+        this.name = name;
+        this.description = description;
+    }
+
+    @Property
+    @NotNull
+    public String getId() {
+        return id;
+    }
+
+    @Property
+    @NotNull
+    public String getName() {
+        return name;
+    }
+
+    @Property
+    @Nullable
+    public String getDescription() {
+        return description;
+    }
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebDriverConfiguration.java

@@ -0,0 +1,75 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.DBPDataSource;
+import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.DBUtils;
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.dbeaver.model.sql.SQLDialectInsertReplaceMethod;
+import org.jkiss.dbeaver.model.sql.SQLDialectMetadata;
+import org.jkiss.dbeaver.model.struct.DBSDataBulkLoader;
+import org.jkiss.utils.CommonUtils;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class WebDriverConfiguration {
+
+    @NotNull
+    private final DBPDataSourceContainer dataSourceContainer;
+
+    public WebDriverConfiguration(@NotNull DBPDataSourceContainer dataSourceContainer) {
+        this.dataSourceContainer = dataSourceContainer;
+    }
+
+    /**
+     * 'On duplicate key' replace methods supported by this connection's SQL dialect
+     */
+    @Property
+    @NotNull
+    public List<WebDictionaryValueInfo> getSupportedInsertReplaceMethods() {
+        SQLDialectMetadata dialect = dataSourceContainer.getDriver().getScriptDialect();
+        List<SQLDialectInsertReplaceMethod> replaceMethods = dialect.getSupportedInsertReplaceMethodsDescriptors();
+        if (CommonUtils.isEmpty(replaceMethods)) {
+            return Collections.emptyList();
+        }
+        return replaceMethods.stream()
+            .map(method -> new WebDictionaryValueInfo(method.getId(), method.getLabel(), method.getDescription()))
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * Whether the connection's database supports bulk load during data import
+     */
+    @Property
+    public boolean isSupportsBulkLoad() {
+        DBPDataSource dataSource = dataSourceContainer.getDataSource();
+        return dataSource != null && DBUtils.getAdapter(DBSDataBulkLoader.class, dataSource) != null;
+    }
+
+    /**
+     * Whether the connection's database supports transaction
+     */
+    @Property
+    public boolean isSupportsTransactions() {
+        DBPDataSource dataSource = dataSourceContainer.getDataSource();
+        return dataSource != null && dataSource.getInfo().supportsTransactions();
+    }
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebExpertSettingsProperties.java

@@ -1,9 +1,27 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.cloudbeaver.model;
 
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.DBPObject;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.connection.DBPDriverConstants;
+import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider;
 import org.jkiss.dbeaver.model.meta.IPropertyValueValidator;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.utils.CommonUtils;
@@ -14,6 +32,7 @@ import org.jkiss.utils.CommonUtils;
 public class WebExpertSettingsProperties implements DBPObject {
     public static final String PROP_READ_ONLY = "readOnly";
     public static final String PROP_AUTO_COMMIT = "autocommit";
+    public static final String PROP_AUTO_COMMIT_MODE = "autoCommitMode";
     public static final String PROP_KEEP_ALIVE_INTERVAL = "keepAliveInterval";
     public static final String PROP_DEFAULT_CATALOG = "defaultCatalogName";
     public static final String PROP_DEFAULT_SCHEMA = "defaultSchemaName";
@@ -29,9 +48,15 @@ public class WebExpertSettingsProperties implements DBPObject {
         return 0;
     }
 
-    @Property(order = 2, id = PROP_AUTO_COMMIT, visibleIf = AutoCommitFieldValidator.class)
-    public boolean isAutoCommit() {
-        return true;
+    @NotNull
+    @Property(
+        order = 2,
+        id = PROP_AUTO_COMMIT_MODE,
+        visibleIf = AutoCommitFieldValidator.class,
+        listProvider = AutoCommitListProvider.class
+    )
+    public AutoCommitMode isAutoCommitMode() {
+        return AutoCommitMode.DEFAULT;
     }
 
     @Property(order = 3, id = PROP_READ_ONLY, visibleIf = ReadOnlyFieldValidator.class)
@@ -39,11 +64,13 @@ public class WebExpertSettingsProperties implements DBPObject {
         return false;
     }
 
+    @Nullable
     @Property(order = 4, id = PROP_DEFAULT_CATALOG, visibleIf = DefaultCatalogFieldVisibleValidator.class)
     public String getDefaultCatalog() {
         return null;
     }
 
+    @Nullable
     @Property(order = 5, id = PROP_DEFAULT_SCHEMA, visibleIf = DefaultSchemaFieldVisibleValidator.class)
     public String getDefaultSchema() {
         return null;
@@ -52,36 +79,50 @@ public class WebExpertSettingsProperties implements DBPObject {
 
     public static class KeepAliveIntervalFieldValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
         @Override
-        public boolean isValidValue(WebExpertSettingsProperties object, Object value) throws IllegalArgumentException {
+        public boolean isValidValue(@NotNull WebExpertSettingsProperties object, @Nullable Object value) throws IllegalArgumentException {
             return CommonUtils.toBoolean(!object.driver.isEmbedded(), true);
         }
     }
 
     public static class AutoCommitFieldValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
         @Override
-        public boolean isValidValue(WebExpertSettingsProperties object, Object value) throws IllegalArgumentException {
+        public boolean isValidValue(@NotNull WebExpertSettingsProperties object, @Nullable Object value) throws IllegalArgumentException {
             return CommonUtils.toBoolean(object.driver.getDriverParameter(DBPDriverConstants.PARAM_SUPPORTS_TRANSACTIONS), true);
         }
     }
 
     public static class ReadOnlyFieldValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
         @Override
-        public boolean isValidValue(WebExpertSettingsProperties object, Object value) throws IllegalArgumentException {
+        public boolean isValidValue(@NotNull WebExpertSettingsProperties object, @Nullable Object value) throws IllegalArgumentException {
             return CommonUtils.toBoolean(object.driver.getDriverParameter(DBPDriverConstants.PARAM_SUPPORTS_READ_ONLY_MODE), true);
         }
     }
 
     public static class DefaultCatalogFieldVisibleValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
         @Override
-        public boolean isValidValue(WebExpertSettingsProperties object, Object value) throws IllegalArgumentException {
+        public boolean isValidValue(@NotNull WebExpertSettingsProperties object, @Nullable Object value) throws IllegalArgumentException {
             return CommonUtils.toBoolean(object.driver.getDriverParameter(DBPDriverConstants.PARAM_SUPPORTS_CATALOG_SELECTION), true);
         }
     }
 
     public static class DefaultSchemaFieldVisibleValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
         @Override
-        public boolean isValidValue(WebExpertSettingsProperties object, Object value) throws IllegalArgumentException {
+        public boolean isValidValue(@NotNull WebExpertSettingsProperties object, @Nullable Object value) throws IllegalArgumentException {
             return CommonUtils.toBoolean(object.driver.getDriverParameter(DBPDriverConstants.PARAM_SUPPORTS_SCHEMA_SELECTION), true);
         }
     }
+
+    public static class AutoCommitListProvider implements IPropertyValueListProvider<WebExpertSettingsProperties> {
+
+        @Override
+        public boolean allowCustomValue() {
+            return false;
+        }
+
+        @Nullable
+        @Override
+        public Object[] getPossibleValues(@Nullable WebExpertSettingsProperties object) {
+            return AutoCommitMode.values();
+        }
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebNetworkHandlerConfig.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
  */
 package io.cloudbeaver.model;
 
+import io.cloudbeaver.server.CBConstants;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
 import org.jkiss.dbeaver.model.net.DBWHandlerType;
@@ -88,7 +89,9 @@ public class WebNetworkHandlerConfig {
         DBPPropertyDescriptor[] descriptor = configuration.getHandlerDescriptor().getHandlerProperties();
         for (DBPPropertyDescriptor p : descriptor) {
             if (p.hasFeature(RegistryConstants.ATTR_PASSWORD)) {
-                secureProperties.computeIfPresent(p.getId(), (k, v) -> CommonUtils.isEmpty(v) ? null : WebConnectionInfo.SECURED_VALUE);
+                secureProperties.computeIfPresent(p.getId(), (k, v) ->
+                    CommonUtils.isEmpty(v) ? null : CBConstants.SECURED_VALUE
+                );
             }
         }
         return secureProperties;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebNetworkHandlerConfigInput.java

@@ -16,6 +16,8 @@
  */
 package io.cloudbeaver.model;
 
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.net.DBWHandlerType;
 import org.jkiss.utils.CommonUtils;
@@ -28,12 +30,14 @@ import java.util.Map;
  */
 public class WebNetworkHandlerConfigInput {
 
+    @NotNull
     private final Map<String, Object> cfg;
 
-    public WebNetworkHandlerConfigInput(Map<String, Object> cfg) {
+    public WebNetworkHandlerConfigInput(@NotNull Map<String, Object> cfg) {
         this.cfg = cfg;
     }
 
+    @Nullable
     public DBWHandlerType getType() {
         return CommonUtils.valueOf(DBWHandlerType.class, JSONUtils.getString(cfg, "type"), null);
     }
@@ -42,6 +46,7 @@ public class WebNetworkHandlerConfigInput {
         return JSONUtils.getString(cfg, "id");
     }
 
+    @Nullable
     public Boolean isEnabled() {
         if (cfg.containsKey("enabled")) {
             return JSONUtils.getBoolean(cfg, "enabled");
@@ -62,11 +67,13 @@ public class WebNetworkHandlerConfigInput {
         return JSONUtils.getString(cfg, "password");
     }
 
-    @Deprecated // use secured properties
+    // Deprecated. Use secured properties
+    @Nullable
     public String getKey() {
         return JSONUtils.getString(cfg, "key");
     }
 
+    @Nullable
     public Boolean isSavePassword() {
         if (cfg.containsKey("savePassword")) {
             return JSONUtils.getBoolean(cfg, "savePassword");
@@ -75,10 +82,12 @@ public class WebNetworkHandlerConfigInput {
         }
     }
 
+    @Nullable
     public Map<String, Object> getProperties() {
         return JSONUtils.getObjectOrNull(cfg, "properties");
     }
 
+    @Nullable
     public Map<String, String> getSecureProperties() {
         var secureProperties = JSONUtils.getObjectOrNull(cfg, "secureProperties");
         if (secureProperties == null) {

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebPropertyInfo.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,13 @@
 package io.cloudbeaver.model;
 
 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.server.CBConstants;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.*;
 import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
+import org.jkiss.dbeaver.model.impl.PropertyDescriptor;
 import org.jkiss.dbeaver.model.impl.ProviderPropertyDescriptor;
 import org.jkiss.dbeaver.model.meta.IPropertyValueListProvider;
 import org.jkiss.dbeaver.model.meta.Property;
@@ -30,6 +32,7 @@ import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
 import org.jkiss.dbeaver.registry.settings.ProductSettingDescriptor;
 import org.jkiss.dbeaver.runtime.properties.ObjectPropertyDescriptor;
+import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 
 import java.lang.reflect.Array;
@@ -39,63 +42,58 @@ import java.util.*;
  * Web connection info
  */
 public class WebPropertyInfo {
-    private WebSession session;
-    private DBPPropertyDescriptor property;
-    private DBPPropertySource propertySource;
-    private boolean showProtected;
+    @NotNull
+    private final WebSession session;
+    @NotNull
+    private final DBPPropertyDescriptor property;
+    @Nullable
+    private final DBPPropertySource propertySource;
 
-    private Object[] validValues;
-
-    private String[] supportedConfigurationTypes = new String[0];
-
-    private Object defaultValue;
-
-    public WebPropertyInfo(WebSession session, DBPPropertyDescriptor property, DBPPropertySource propertySource) {
+    public WebPropertyInfo(
+        @NotNull WebSession session,
+        @NotNull DBPPropertyDescriptor property,
+        @Nullable DBPPropertySource propertySource
+    ) {
         this.session = session;
         this.property = property;
         this.propertySource = propertySource;
     }
 
-    public WebPropertyInfo(WebSession session, DBPPropertyDescriptor property) {
-        this.session = session;
-        this.property = property;
-    }
-
-    public boolean isShowProtected() {
-        return showProtected;
-    }
-
-    public void setShowProtected(boolean showProtected) {
-        this.showProtected = showProtected;
+    public WebPropertyInfo(@NotNull WebSession session, @NotNull DBPPropertyDescriptor property) {
+        this(session, property, null);
     }
 
     ///////////////////////////////////
     // General properties
     ///////////////////////////////////
 
+    @NotNull
     @Property
     public String getId() {
         return CommonUtils.toString(property.getId());
     }
 
+    @NotNull
     @Property
     public String getDisplayName() {
-        if (property instanceof DBPNamedObjectLocalized) {
-            return ((DBPNamedObjectLocalized) property).getLocalizedName(session.getLocale());
+        if (property instanceof DBPNamedObjectLocalized localized) {
+            return localized.getLocalizedName(session.getLocale());
         } else {
             return property.getDisplayName();
         }
     }
 
+    @Nullable
     @Property
     public String getDescription() {
-        if (property instanceof DBPObjectWithDescriptionLocalized) {
-            return ((DBPObjectWithDescriptionLocalized) property).getLocalizedDescription(session.getLocale());
+        if (property instanceof DBPObjectWithDescriptionLocalized localized) {
+            return localized.getLocalizedDescription(session.getLocale());
         } else {
             return property.getDescription();
         }
     }
 
+    @Nullable
     @Property
     public String getHint() {
         return property.getHint();
@@ -106,48 +104,59 @@ public class WebPropertyInfo {
         return property instanceof ObjectPropertyDescriptor ? ((ObjectPropertyDescriptor) property).getOrderNumber() : -1;
     }
 
+    @Nullable
     @Property
     public String getCategory() {
         return property.getCategory();
     }
 
+    @Nullable
     @Property
     public String getType() {
         return getDataType();
     }
 
+    @Nullable
     @Property
     public String getDataType() {
         Class<?> dataType = property.getDataType();
         return dataType == null ? null : dataType.getSimpleName();
     }
 
+    @NotNull
     @Property
     public PropertyLength getLength() {
         return property.getLength();
     }
 
+    @Nullable
     @Property
     public Object getDefaultValue() throws DBException {
-        var defaultValue = property.getDefaultValue() == null ? this.defaultValue : property.getDefaultValue();
-        return defaultValue == null ? getValue() : defaultValue;
+        Object defaultValue = property.getDefaultValue();
+        if (property instanceof ObjectPropertyDescriptor && defaultValue == null) {
+            return getValue();
+        }
+        return defaultValue;
     }
 
+    @Nullable
     @Property
     public Object getValue() throws DBException {
         Object value = propertySource == null ? null : propertySource.getPropertyValue(session.getProgressMonitor(), property.getId());
-        if (property instanceof ObjectPropertyDescriptor) {
-            ObjectPropertyDescriptor opd = (ObjectPropertyDescriptor) property;
-            if (!showProtected && opd.isPassword() || opd.isHidden()) {
-                if (value == null || value.toString().isEmpty()) {
-                    return "";
-                }
-                return "******";
+        if (property instanceof ObjectPropertyDescriptor opd &&
+            (opd.isPassword() || opd.isHidden())
+        ) {
+            return maskValue(value);
+        } else if (property instanceof PropertyDescriptor pd) {
+            String[] features = pd.getFeatures();
+            if (features != null && ArrayUtils.contains(features, DBConstants.PROP_FEATURE_PASSWORD)) {
+                return maskValue(value);
             }
         }
         return value == null ? null : makePropertyValue(value);
     }
 
+    @Nullable
     @Property
     public Object[] getValidValues() {
         if (property instanceof IPropertyValueListProvider) {
@@ -160,17 +169,18 @@ public class WebPropertyInfo {
                 }
                 return validValues;
             }
-            return validValues;
         }
-        return validValues;
+        return null;
     }
 
+    @NotNull
     @Property
     public String[] getFeatures() {
         String[] features = property.getFeatures();
         return features == null ? new String[0] : features;
     }
 
+    @NotNull
     @Property
     public String[] getSupportedConfigurationTypes() {
         if (property instanceof ProviderPropertyDescriptor) {
@@ -178,7 +188,7 @@ public class WebPropertyInfo {
                 .map(DBPDriverConfigurationType::toString)
                 .toArray(String[]::new);
         }
-        return supportedConfigurationTypes;
+        return new String[0];
     }
 
     @Property
@@ -199,12 +209,14 @@ public class WebPropertyInfo {
         return false;
     }
 
+    @NotNull
     @Override
     public String toString() {
         return CommonUtils.toString(property.getId());
     }
 
-    private Object makePropertyValue(Object value) {
+    @Nullable
+    private Object makePropertyValue(@Nullable Object value) {
         if (value == null) {
             return null;
 //        } else if (value instanceof DBSObject) {
@@ -243,9 +255,11 @@ public class WebPropertyInfo {
             List<Object> result = new ArrayList<>();
             int length = Array.getLength(value);
             for (int i = 0; i < length; i++) {
-                result.add(Array.get(value, i));
+                result.add(makePropertyValue(Array.get(value, i)));
             }
             return result;
+        } else if (value instanceof Enum<?> enumValue) {
+            return new WebBasicEnumObjectInfo(enumValue.toString(), enumValue.name());
         }
         Class<?> dataType = property.getDataType();
         if (dataType == Boolean.class || dataType == Boolean.TYPE) {
@@ -284,25 +298,19 @@ public class WebPropertyInfo {
         return conditions;
     }
 
-
-    //TODO: delete after refactoring on front-end
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-    //TODO: delete after refactoring on front-end
-    public void setValidValues(Object[] validValues) {
-        this.validValues = validValues;
-    }
-
-    //TODO: delete after refactoring on front-end
-    public void setSupportedConfigurationTypes(String[] supportedConfigurationTypes) {
-        this.supportedConfigurationTypes = supportedConfigurationTypes;
-    }
-
     public record Condition(@NotNull String expression, @NotNull Type conditionType) {
         public enum Type {
             HIDE,
             READ_ONLY
         }
     }
+
+    @NotNull
+    private static String maskValue(@Nullable Object value) {
+        if (value == null || value.toString().isEmpty()) {
+            return "";
+        } else {
+            return CBConstants.SECURED_VALUE;
+        }
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/Operation.java

@@ -0,0 +1,41 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation;
+
+import io.cloudbeaver.model.api.annotation.responses.ApiResponse;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Operation {
+
+	String summary() default "";
+
+	String description() default "";
+
+	String operationId() default "";
+
+	String method() default "";
+
+	Parameter[] parameters() default {};
+
+	ApiResponse[] responses() default {};
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/Parameter.java

@@ -0,0 +1,51 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation;
+
+import io.cloudbeaver.model.api.annotation.enums.Explode;
+import io.cloudbeaver.model.api.annotation.enums.ParameterIn;
+import io.cloudbeaver.model.api.annotation.enums.ParameterStyle;
+import io.cloudbeaver.model.api.annotation.media.ArraySchema;
+import io.cloudbeaver.model.api.annotation.media.Schema;
+
+import java.lang.annotation.*;
+
+@Repeatable(Parameters.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+public @interface Parameter {
+
+	String name() default "";
+
+	String description() default "";
+
+	boolean required() default false;
+
+	String example() default "";
+
+	ParameterIn in() default ParameterIn.DEFAULT;
+
+	Schema schema() default @Schema;
+
+	ArraySchema array() default @ArraySchema;
+
+	ParameterStyle style() default ParameterStyle.DEFAULT;
+
+	Explode explode() default Explode.DEFAULT;
+
+	boolean hidden() default false;
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/Parameters.java

@@ -0,0 +1,29 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+public @interface Parameters {
+
+	Parameter[] value();
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/enums/Explode.java

@@ -0,0 +1,34 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation.enums;
+
+public enum Explode {
+	TRUE("true"),
+	FALSE("false"),
+	DEFAULT("default");
+
+	private final String value;
+
+	Explode(final String value) {
+		this.value = value;
+	}
+
+	@Override
+	public String toString() {
+		return value;
+	}
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/enums/ParameterIn.java

@@ -0,0 +1,36 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation.enums;
+
+public enum ParameterIn {
+	DEFAULT("default"),
+	QUERY("query"),
+	HEADER("header"),
+	PATH("path"),
+	COOKIE("cookie");
+
+	private final String value;
+
+	ParameterIn(final String value) {
+		this.value = value;
+	}
+
+	@Override
+	public String toString() {
+		return value;
+	}
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/enums/ParameterStyle.java

@@ -0,0 +1,39 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation.enums;
+
+public enum ParameterStyle {
+	MATRIX("matrix"),
+	LABEL("label"),
+	FORM("form"),
+	SIMPLE("simple"),
+	SPACEDELIMITED("spaceDelimited"),
+	PIPEDELIMITED("pipeDelimited"),
+	DEEPOBJECT("deepObject"),
+	DEFAULT("default");
+
+	private final String value;
+
+	ParameterStyle(final String value) {
+		this.value = value;
+	}
+
+	@Override
+	public String toString() {
+		return value;
+	}
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/media/ArraySchema.java

@@ -0,0 +1,29 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation.media;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
+public @interface ArraySchema {
+
+	Schema schema() default @Schema;
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/media/Content.java

@@ -0,0 +1,29 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation.media;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+public @interface Content {
+
+	Schema schema() default @Schema;
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/media/Schema.java

@@ -0,0 +1,37 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation.media;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
+public @interface Schema {
+
+	String description() default "";
+
+	String example() default "";
+
+	String type() default "";
+
+	Class<?> implementation() default Void.class;
+
+	boolean required() default false;
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/responses/ApiResponse.java

@@ -0,0 +1,35 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation.responses;
+
+import io.cloudbeaver.model.api.annotation.media.Content;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+public @interface ApiResponse {
+
+	String responseCode() default "default";
+
+	String description() default "";
+
+	Content[] content() default {};
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/api/annotation/tags/Tag.java

@@ -0,0 +1,31 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.api.annotation.tags;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Tag {
+
+	String name() default "";
+
+	String description() default "";
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java

@@ -20,13 +20,11 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.registry.fs.FileSystemProviderRegistry;
+import org.jkiss.dbeaver.model.fs.DBFUtils;
 import org.jkiss.utils.CommonUtils;
 
-import java.net.URI;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
 import java.nio.file.Path;
 
 /**
@@ -65,30 +63,20 @@ public abstract class BaseServerConfigurationController<T extends ServletServerC
         if (CommonUtils.isEmpty(workspaceLocation)) {
             return defaultWorkspaceLocation;
         }
-        URI workspaceUri = URI.create(workspaceLocation);
-        if (workspaceUri.getScheme() == null) {
-            // default filesystem
-            return getHomeDirectory().resolve(workspaceLocation);
-        } else {
-            var externalFsProvider =
-                FileSystemProviderRegistry.getInstance().getFileSystemProviderBySchema(workspaceUri.getScheme());
-            if (externalFsProvider == null) {
-                log.error("File system not found for scheme: " + workspaceUri.getScheme() + " default workspace " +
-                    "location will be used");
+        try {
+            Path externalFsPath = DBFUtils.getPathFromURI(workspaceLocation);
+            if (externalFsPath == null) {
+                log.warn("Failed to detect workspace path from URI: " + workspaceLocation +
+                    " default workspace location will be used");
                 return defaultWorkspaceLocation;
             }
-            ClassLoader fsClassloader = externalFsProvider.getInstance().getClass().getClassLoader();
-            try (FileSystem externalFileSystem = FileSystems.newFileSystem(workspaceUri,
-                System.getenv(),
-                fsClassloader)) {
-                log.info("Path from external filesystem used for workspace: " + workspaceUri);
-                return externalFileSystem.provider().getPath(workspaceUri);
-            } catch (Exception e) {
-                log.error("Failed to initialize workspace path: " + workspaceUri + " default workspace " +
-                    "location will be used", e);
-            }
+            log.info("Path from external filesystem used for workspace: " + externalFsPath);
+            return externalFsPath;
+        } catch (DBException e) {
+            log.error("Failed to detect workspace path from URI: " + workspaceLocation +
+                " default workspace location will be used", e);
+            return defaultWorkspaceLocation;
         }
-        return defaultWorkspaceLocation;
     }
 
     @Nullable

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServletApplication.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
  */
 package io.cloudbeaver.model.app;
 
-import io.cloudbeaver.model.cli.CloudBeaverInstanceServer;
 import io.cloudbeaver.model.log.SLF4JLogHandler;
+import io.cloudbeaver.registry.WebFeatureRegistry;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.jkiss.code.NotNull;
@@ -25,17 +25,18 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBFileController;
+import org.jkiss.dbeaver.model.app.DBPLockManagerProvider;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
-import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
+import org.jkiss.dbeaver.model.fs.lock.LockManager;
+import org.jkiss.dbeaver.model.fs.lock.shared.SharedFileLockManager;
 import org.jkiss.dbeaver.model.impl.app.ApplicationRegistry;
 import org.jkiss.dbeaver.model.impl.app.BaseApplicationImpl;
 import org.jkiss.dbeaver.model.impl.app.BaseWorkspaceImpl;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
-import org.jkiss.dbeaver.model.websocket.event.WSEventController;
 import org.jkiss.dbeaver.runtime.IVariableResolver;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
@@ -49,7 +50,7 @@ import java.util.Map;
 /**
  * Servlet application
  */
-public abstract class BaseServletApplication extends BaseApplicationImpl implements ServletApplication {
+public abstract class BaseServletApplication extends BaseApplicationImpl implements ServletApplication, DBPLockManagerProvider {
 
     public static final String DEFAULT_CONFIG_FILE_PATH = "/etc/cloudbeaver.conf";
     public static final String CUSTOM_CONFIG_FOLDER = "custom";
@@ -59,7 +60,8 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
     private static final Log log = Log.getLog(BaseServletApplication.class);
 
     private String instanceId;
-    private CloudBeaverInstanceServer instanceServer;
+
+    @NotNull
     @Override
     public RMController createResourceController(
         @NotNull SMCredentialsProvider credentialsProvider,
@@ -74,10 +76,16 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
         throw new IllegalStateException("File controller is not supported by " + getClass().getSimpleName());
     }
 
-    @Nullable
+    @NotNull
     @Override
-    public Path getDefaultWorkingFolder() {
-        return getServerConfigurationController().getWorkspacePath();
+    public LockManager createLockManager(@NotNull String applicationId, @NotNull Path metadataFolder) throws DBException {
+        return new SharedFileLockManager(applicationId, metadataFolder);
+    }
+
+    @NotNull
+    @Override
+    public LockManager createLockManager() throws DBException {
+        return new SharedFileLockManager(getApplicationInstanceId());
     }
 
     @Override
@@ -162,6 +170,7 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
      * Method returns VoidSecretController instance.
      * Advanced apps may implement it differently.
      */
+    @NotNull
     @Override
     public DBSSecretController getSecretController(
         @NotNull SMCredentialsProvider credentialsProvider,
@@ -176,20 +185,20 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
 
     @SuppressWarnings("unchecked")
     public static void patchConfigurationWithProperties(
-        Map<String, Object> configProps, IVariableResolver varResolver
+        @NotNull Map<String, Object> configProps,
+        @NotNull IVariableResolver varResolver
     ) {
         for (Map.Entry<String, Object> entry : configProps.entrySet()) {
             Object propValue = entry.getValue();
-            if (propValue instanceof String) {
-                entry.setValue(GeneralUtils.replaceVariables((String) propValue, varResolver));
+            if (propValue instanceof String strValue) {
+                entry.setValue(GeneralUtils.replaceVariables(strValue, varResolver));
             } else if (propValue instanceof Map) {
                 patchConfigurationWithProperties((Map<String, Object>) propValue, varResolver);
-            } else if (propValue instanceof List) {
-                List value = (List) propValue;
+            } else if (propValue instanceof List value) {
                 for (int i = 0; i < value.size(); i++) {
                     Object colItem = value.get(i);
-                    if (colItem instanceof String) {
-                        value.set(i, GeneralUtils.replaceVariables((String) colItem, varResolver));
+                    if (colItem instanceof String strItem) {
+                        value.set(i, GeneralUtils.replaceVariables(strItem, varResolver));
                     } else if (colItem instanceof Map) {
                         patchConfigurationWithProperties((Map<String, Object>) colItem, varResolver);
                     }
@@ -202,12 +211,9 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
     @Override
     public Object start(IApplicationContext context) {
         initializeApplicationServices();
+        setWorkspacePath(getServerConfigurationController().getWorkspacePath());
+
         try {
-            try {
-                this.instanceServer = new CloudBeaverInstanceServer();
-            } catch (Exception e) {
-                log.error("Error initializing instance server", e);
-            }
             startServer();
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -218,6 +224,7 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
 
     protected abstract void startServer() throws DBException;
 
+    @NotNull
     @Override
     public synchronized String getApplicationInstanceId() throws DBException {
         if (instanceId == null) {
@@ -242,26 +249,18 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
         return BaseWorkspaceImpl.readWorkspaceIdProperty();
     }
 
-    @Override
-    public Path getWorkspaceDirectory() {
-        return getServerConfigurationController().getWorkspacePath();
-    }
-
-
+    @NotNull
     public String getApplicationId() {
         try {
             return getApplicationInstanceId();
         } catch (DBException e) {
-            return null;
+            // Fallback to hash code
+            return getClass().getSimpleName() + "#" + hashCode();
         }
     }
 
-    @Override
-    public WSEventController getEventController() {
-        return null;
-    }
-
-    public abstract ServletServerConfigurationController getServerConfigurationController();
+    @NotNull
+    public abstract ServletServerConfigurationController<?> getServerConfigurationController();
 
     @Override
     public boolean isEnvironmentVariablesAccessible() {
@@ -276,14 +275,14 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
         }
     }
 
-    @Nullable
-    @Override
-    public ApplicationInstanceController getInstanceServer() {
-        return instanceServer;
-    }
-
     @Override
     public boolean isAnonymousAccessEnabled() {
         return getAppConfiguration().isAnonymousAccessEnabled();
     }
+
+    @NotNull
+    @Override
+    public WebFeatureRegistry getFeatureRegistry() {
+        return WebFeatureRegistry.getInstance();
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java

@@ -17,7 +17,6 @@
 package io.cloudbeaver.model.app;
 
 import io.cloudbeaver.DBWFeatureSet;
-import io.cloudbeaver.registry.WebFeatureRegistry;
 import io.cloudbeaver.utils.ServletAppUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.DBConstants;
@@ -115,7 +114,7 @@ public abstract class BaseWebAppConfiguration implements ServletAppConfiguration
     public String[] getEnabledFeatures() {
         if (enabledFeatures == null) {
             // No config - enable all features (+backward compatibility)
-            return WebFeatureRegistry.getInstance().getWebFeatures()
+            return ServletAppUtils.getServletApplication().getFeatureRegistry().getWebFeatures()
                 .stream().map(DBWFeatureSet::getId).toArray(String[]::new);
         }
         return enabledFeatures;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/ServletApplication.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
  */
 package io.cloudbeaver.model.app;
 
+import io.cloudbeaver.registry.WebFeatureRegistry;
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBFileController;
 import org.jkiss.dbeaver.model.app.DBPApplication;
@@ -42,14 +44,16 @@ public interface ServletApplication extends DBPApplication {
         return false;
     }
 
+    @NotNull
     ServletAppConfiguration getAppConfiguration();
 
+    @NotNull
     ServletServerConfiguration getServerConfiguration();
 
+    @NotNull
     Path getDataDirectory(boolean create);
 
-    Path getWorkspaceDirectory();
-
+    @NotNull
     Path getHomeDirectory();
 
     boolean isMultiNode();
@@ -58,30 +62,35 @@ public interface ServletApplication extends DBPApplication {
 
     SMAdminController getAdminSecurityController(@NotNull SMCredentialsProvider credentialsProvider) throws DBException;
 
+    @NotNull
     DBSSecretController getSecretController(
         @NotNull SMCredentialsProvider credentialsProvider,
         SMSessionContext smSessionContext
     ) throws DBException;
 
+    @NotNull
     RMController createResourceController(
         @NotNull SMCredentialsProvider credentialsProvider,
         @NotNull DBPWorkspace workspace
     ) throws DBException;
 
+    @NotNull
     DBFileController createFileController(@NotNull SMCredentialsProvider credentialsProvider);
 
-    String getServerURL();
-
+    @NotNull
     default String getServicesURI() {
         return "/";
     }
 
+    @NotNull
     default String getRootURI() {
         return "";
     }
 
+    @NotNull
     String getApplicationInstanceId() throws DBException;
 
+    @NotNull
     WSEventController getEventController();
 
     /**
@@ -94,12 +103,18 @@ public interface ServletApplication extends DBPApplication {
     /**
      * Collector that contains information about system.
      */
-    @NotNull
-    ServletSystemInformationCollector getSystemInformationCollector();
+    @Nullable
+    ServletSystemInformationCollector<?> getSystemInformationCollector();
 
-    default void getStatusInfo(Map<String, Object> infoMap) {
+    default void getStatusInfo(@NotNull Map<String, Object> infoMap) {
 
     }
 
     boolean isAnonymousAccessEnabled();
+
+    /**
+     * Web feature registry
+     */
+    @NotNull
+    WebFeatureRegistry getFeatureRegistry();
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/ServletAuthApplication.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 
 public interface ServletAuthApplication extends ServletApplication {
+    @NotNull
     ServletAuthConfiguration getAuthConfiguration();
 
     @Nullable

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/ServletSystemInformationCollector.java

@@ -62,6 +62,7 @@ public class ServletSystemInformationCollector<T extends ServletApplication> imp
     private DBPConnectionInformation smDatabaseInfo;
     private String workspacePath;
     private final DeploymentType deploymentType;
+    private boolean internalDatabaseInfoCollected = false;
 
     public ServletSystemInformationCollector(@NotNull T application) {
         this.application = application;
@@ -158,7 +159,15 @@ public class ServletSystemInformationCollector<T extends ServletApplication> imp
     /**
      * Collects info about internal databases.
      */
-    public void collectInternalDatabaseUseInformation() throws DBException {
+    public synchronized void collectInternalDatabaseUseInformation() throws DBException {
+        if (internalDatabaseInfoCollected) {
+            return;
+        }
+        collectInternalDatabaseInfo();
+        this.internalDatabaseInfoCollected = true;
+    }
+
+    protected void collectInternalDatabaseInfo() throws DBException {
         this.smDatabaseInfo = application.getAdminSecurityController(new NoAuthCredentialsProvider())
             .getInternalDatabaseInformation();
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/fs/WebFSUtils.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 
 import java.nio.file.Path;
 
-public class FSUtils {
+public class WebFSUtils {
     @NotNull
     public static String makeUniqueFsId(@NotNull DBFVirtualFileSystem fileSystem) {
         return fileSystem.getType() + "://" + fileSystem.getId();

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java

@@ -60,26 +60,31 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
         return project.getId();
     }
 
+    @NotNull
     @Override
     public String getNodeType() {
         return "rm.project";
     }
 
+    @NotNull
     @Override
     public String getNodeDisplayName() {
         return project.getDisplayName();
     }
 
+    @NotNull
     @Override
-    public String getLocalizedName(String locale) {
+    public String getLocalizedName(@NotNull String locale) {
         return getNodeDisplayName();
     }
 
+    @Nullable
     @Override
     public String getNodeDescription() {
         return project.getDescription();
     }
 
+    @Nullable
     @Override
     public DBPImage getNodeIcon() {
         return DBIcon.PROJECT;
@@ -90,6 +95,7 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
         return true;
     }
 
+    @Nullable
     @Override
     public DBNResourceManagerResource[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
         if (children == null && !monitor.isForceCacheUsage()) {
@@ -109,14 +115,9 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
         return ((DBNResourceManagerRoot) getParentNode()).getResourceController();
     }
 
-    @Deprecated
+    @Nullable
     @Override
-    public String getNodeItemPath() {
-        return getParentNode().getNodeItemPath() + "/" + getName();
-    }
-
-    @Override
-    public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBException {
+    public DBNNode refreshNode(@NotNull DBRProgressMonitor monitor, @Nullable Object source) throws DBException {
         children = null;
         return this;
     }
@@ -141,6 +142,7 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
         return project;
     }
 
+    @NotNull
     @Override
     public String toString() {
         return getNodeDisplayName();

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java

@@ -31,8 +31,6 @@ import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.rm.RMResource;
 import org.jkiss.dbeaver.model.rm.RMResourceType;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-import org.jkiss.dbeaver.registry.ResourceTypeDescriptor;
-import org.jkiss.dbeaver.registry.ResourceTypeRegistry;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.IOUtils;
@@ -44,29 +42,34 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
 
     private final RMResource resource;
 
-    DBNResourceManagerResource(DBNNode parentNode, RMResource resource) {
+    DBNResourceManagerResource(@NotNull DBNNode parentNode, @NotNull RMResource resource) {
         super(parentNode);
         this.resource = resource;
     }
 
+    @NotNull
     @Override
     public String getNodeType() {
         return "rm.resource";
     }
 
+    @NotNull
     @Override
     public String getNodeDisplayName() {
         return resource.getName();
     }
 
+    @Nullable
     @Override
     public String getNodeDescription() {
         return null;
     }
 
+    @Nullable
     @Override
     public DBPImage getNodeIcon() {
         if (resource.isFolder()) {
+/*
             if (getParentNode() instanceof DBNResourceManagerResource) {
                 return DBIcon.TREE_FOLDER;
             }
@@ -78,11 +81,12 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
             if (folderResType != null) {
                 return folderResType.getFolderIcon();
             }
+*/
             return DBIcon.TREE_FOLDER;
         } else {
             var fileExtension = IOUtils.getFileExtension(getNodeDisplayName());
             if (!CommonUtils.isEmpty(fileExtension)) {
-                RMProject project = getProjectNode();
+                RMProject project = getRmProject();
                 if (project != null) {
                     for (RMResourceType rt : project.getResourceTypes()) {
                         if (ArrayUtils.contains(rt.getFileExtensions(), fileExtension)) {
@@ -95,7 +99,8 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
         }
     }
 
-    private RMProject getProjectNode() {
+    @Nullable
+    public RMProject getRmProject() {
         for (DBNNode node = this; node != null; node = node.getParentNode()) {
             if (node instanceof DBNResourceManagerProject) {
                 return  ((DBNResourceManagerProject) node).getProject();
@@ -109,6 +114,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
         return resource.isFolder();
     }
 
+    @Nullable
     @Override
     public DBNNode[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
         if (children == null && !monitor.isForceCacheUsage()) {
@@ -154,14 +160,9 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
         throw new DBException("Can't detect resource root node");
     }
 
-    @Deprecated
+    @Nullable
     @Override
-    public String getNodeItemPath() {
-        return getParentNode().getNodeItemPath() + "/" + getNodeDisplayName();
-    }
-
-    @Override
-    public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBException {
+    public DBNNode refreshNode(@NotNull DBRProgressMonitor monitor, @Nullable Object source) throws DBException {
         this.children = null;
         return super.refreshNode(monitor, source);
     }
@@ -171,7 +172,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
     }
 
     @Override
-    public void rename(DBRProgressMonitor monitor, String newName) throws DBException {
+    public void rename(@NotNull DBRProgressMonitor monitor, @NotNull String newName) throws DBException {
         String resourceName = resource.getName();
         try {
             if (newName.indexOf('.') == -1) {
@@ -192,6 +193,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
         }
     }
 
+    @NotNull
     @Override
     public String toString() {
         return getNodeDisplayName();

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java

@@ -19,6 +19,7 @@ package io.cloudbeaver.model.rm;
 
 import io.cloudbeaver.model.session.WebSession;
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBPHiddenObject;
@@ -49,6 +50,7 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
         return resourceController;
     }
 
+    @NotNull
     @Override
     public String getNodeType() {
         return "rm";
@@ -60,16 +62,19 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
         return "rm";
     }
 
+    @NotNull
     @Override
     public String getNodeDisplayName() {
         return "resources";
     }
 
+    @Nullable
     @Override
     public String getNodeDescription() {
         return "Resources";
     }
 
+    @Nullable
     @Override
     public DBPImage getNodeIcon() {
         return null;
@@ -80,6 +85,7 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
         return true;
     }
 
+    @Nullable
     @Override
     public DBNResourceManagerProject[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
         if (projects == null && !monitor.isForceCacheUsage()) {
@@ -109,15 +115,9 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
         return projects;
     }
 
-    @Deprecated
+    @Nullable
     @Override
-    public String getNodeItemPath() {
-        // Path doesn't include project name
-        return NodePathType.ext.getPrefix() + getNodeDisplayName();
-    }
-
-    @Override
-    public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBException {
+    public DBNNode refreshNode(@NotNull DBRProgressMonitor monitor, @Nullable Object source) throws DBException {
         projects = null;
         return this;
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/BaseLocalResourceController.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
  */
 package io.cloudbeaver.model.rm.local;
 
-import io.cloudbeaver.BaseWebProjectImpl;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -27,8 +26,9 @@ import org.jkiss.dbeaver.model.DBPDataSourceFolder;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
-import org.jkiss.dbeaver.model.fs.lock.FileLockController;
-import org.jkiss.dbeaver.model.impl.auth.SessionContextImpl;
+import org.jkiss.dbeaver.model.fs.lock.LockManager;
+import org.jkiss.dbeaver.model.fs.lock.LockOptions;
+import org.jkiss.dbeaver.model.fs.lock.LockTarget;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMEvent;
 import org.jkiss.dbeaver.model.rm.RMEventManager;
@@ -51,25 +51,23 @@ public abstract class BaseLocalResourceController implements RMController {
     private static final Log log = Log.getLog(BaseLocalResourceController.class);
 
     public static final String DEFAULT_CHANGE_ID = "0";
-    private static final String FILE_REGEX = "(?U)[\\w.$()@/\\\\ -]+";
-    private static final String PROJECT_REGEX = "(?U)[\\w.$()@ -]+"; // slash not allowed in project name
 
     @NotNull
     protected final DBPWorkspace workspace;
     @NotNull
-    protected final FileLockController lockController;
+    protected final LockManager lockController;
 
     protected BaseLocalResourceController(
         @NotNull DBPWorkspace workspace,
-        @NotNull FileLockController lockController
+        @NotNull LockManager lockController
     ) {
         this.workspace = workspace;
         this.lockController = lockController;
     }
 
+    @Nullable
     @Override
-    public RMProject getProject(@NotNull String projectId, boolean readResources, boolean readProperties)
-        throws DBException {
+    public RMProject getProject(@NotNull String projectId, boolean readResources, boolean readProperties) throws DBException {
         RMProject project = makeProjectFromId(projectId, true);
         if (project == null) {
             return null;
@@ -85,6 +83,7 @@ public abstract class BaseLocalResourceController implements RMController {
         return project;
     }
 
+    @Nullable
     @Override
     public Object getProjectProperty(@NotNull String projectId, @NotNull String propName) throws DBException {
         var project = getWebProject(projectId, false);
@@ -97,7 +96,7 @@ public abstract class BaseLocalResourceController implements RMController {
     public void setProjectProperty(
         @NotNull String projectId,
         @NotNull String propName,
-        @NotNull Object propValue
+        @Nullable Object propValue
     ) throws DBException {
         RMLocalProject webProject = getWebProject(projectId, false);
         doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
@@ -110,8 +109,7 @@ public abstract class BaseLocalResourceController implements RMController {
     }
 
     @Override
-    public String getProjectsDataSources(@NotNull String projectId, @Nullable String[] dataSourceIds)
-        throws DBException {
+    public String getProjectsDataSources(@NotNull String projectId, @Nullable String[] dataSourceIds) throws DBException {
         DBPProject projectMetadata = getWebProject(projectId, false);
         return doFileReadOperation(
             projectId,
@@ -159,7 +157,7 @@ public abstract class BaseLocalResourceController implements RMController {
         @NotNull String configuration,
         @Nullable List<String> dataSourceIds
     ) throws DBException {
-        try (var lock = lockController.lock(projectId, "updateProjectDataSources")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("updateProjectDataSources"))) {
             DBPProject project = getWebProject(projectId, false);
             return doFileWriteOperation(
                 projectId, project.getMetadataFolder(false),
@@ -190,7 +188,7 @@ public abstract class BaseLocalResourceController implements RMController {
         @NotNull String projectId,
         @NotNull String[] dataSourceIds
     ) throws DBException {
-        try (var projectLock = lockController.lock(projectId, "deleteDatasources")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("deleteDataSources"))) {
             DBPProject project = getWebProject(projectId, false);
             doFileWriteOperation(projectId, project.getMetadataFolder(false), () -> {
                 DBPDataSourceRegistry registry = project.getDataSourceRegistry();
@@ -215,7 +213,7 @@ public abstract class BaseLocalResourceController implements RMController {
         @NotNull String projectId,
         @NotNull String folderPath
     ) throws DBException {
-        try (var projectLock = lockController.lock(projectId, "createDatasourceFolder")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("createDatasourceFolder"))) {
             DBPProject project = getWebProject(projectId, false);
             log.debug("Creating data source folder '" + folderPath + "' in project '" + projectId + "'");
             doFileWriteOperation(projectId, project.getMetadataFolder(false),
@@ -226,8 +224,10 @@ public abstract class BaseLocalResourceController implements RMController {
                     GeneralUtils.validateResourceName(newName);
                     var parent = result.getParent();
                     var parentFolder = parent == null ? null : registry.getFolder(parent.toString().replace("\\", "/"));
-                    DBPDataSourceFolder newFolder = registry.addFolder(parentFolder, newName);
-                    ((DataSourcePersistentRegistry) registry).saveDataSources();
+                    registry.addFolder(parentFolder, newName);
+                    if (registry instanceof DataSourcePersistentRegistry pr) {
+                        pr.saveDataSources();
+                    }
                     registry.checkForErrors();
                     return null;
                 }
@@ -241,21 +241,19 @@ public abstract class BaseLocalResourceController implements RMController {
         @NotNull String[] folderPaths,
         boolean dropContents
     ) throws DBException {
-        try (var projectLock = lockController.lock(projectId, "createDatasourceFolder")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("createDatasourceFolder"))) {
             DBPProject project = getWebProject(projectId, false);
             doFileWriteOperation(projectId, project.getMetadataFolder(false),
                 () -> {
                     DBPDataSourceRegistry registry = project.getDataSourceRegistry();
                     for (String folderPath : folderPaths) {
                         DBPDataSourceFolder folder = registry.getFolder(folderPath);
-                        if (folder != null) {
-                            log.debug("Deleting data source folder '" + folderPath + "' in project '" + projectId + "'");
-                            registry.removeFolder(folder, dropContents);
-                        } else {
-                            log.warn("Can not find folder by path [" + folderPath + "] for deletion");
-                        }
+                        log.debug("Deleting data source folder '" + folderPath + "' in project '" + projectId + "'");
+                        registry.removeFolder(folder, dropContents);
+                    }
+                    if (registry instanceof DataSourcePersistentRegistry pr) {
+                        pr.saveDataSources();
                     }
-                    ((DataSourcePersistentRegistry) registry).saveDataSources();
                     registry.checkForErrors();
                     return null;
                 }
@@ -269,7 +267,7 @@ public abstract class BaseLocalResourceController implements RMController {
         @NotNull String oldPath,
         @NotNull String newPath
     ) throws DBException {
-        try (var projectLock = lockController.lock(projectId, "createDatasourceFolder")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("createDatasourceFolder"))) {
             DBPProject project = getWebProject(projectId, false);
             log.debug("Moving data source folder from '" + oldPath + "' to '" + newPath + "' in project '" + projectId + "'");
             doFileWriteOperation(projectId, project.getMetadataFolder(false),
@@ -284,19 +282,19 @@ public abstract class BaseLocalResourceController implements RMController {
         }
     }
 
-    protected abstract RMLocalProject getWebProject(String projectId, boolean refresh) throws DBException;
+    protected abstract RMLocalProject getWebProject(@NotNull String projectId, boolean refresh) throws DBException;
 
-    protected abstract <T> T doFileWriteOperation(String projectId, Path file, RMFileOperation<T> operation)
+    protected abstract <T> T doFileWriteOperation(@NotNull String projectId, @NotNull Path file, @NotNull RMFileOperation<T> operation)
         throws DBException;
 
-    protected abstract <T> T doFileReadOperation(String projectId, Path file, RMFileOperation<T> operation)
+    protected abstract <T> T doFileReadOperation(@NotNull String projectId, @NotNull Path file, @NotNull RMFileOperation<T> operation)
         throws DBException;
 
-    protected abstract <T> T doProjectOperation(String projectId, RMFileOperation<T> operation) throws DBException;
+    protected abstract <T> T doProjectOperation(@NotNull String projectId, @NotNull RMFileOperation<T> operation) throws DBException;
 
-    protected abstract RMProject makeProjectFromId(String projectId, boolean loadPermissions) throws DBException;
+    protected abstract RMProject makeProjectFromId(@NotNull String projectId, boolean loadPermissions) throws DBException;
 
-    protected void validateResourcePath(String resourcePath) throws DBException {
+    protected void validateResourcePath(@NotNull String resourcePath) throws DBException {
         var fullPath = Paths.get(resourcePath);
         for (Path path : fullPath) {
             String fileName = IOUtils.getFileNameWithoutExtension(path);
@@ -314,28 +312,6 @@ public abstract class BaseLocalResourceController implements RMController {
         }
     }
 
-    protected class InternalWebProjectImpl extends BaseWebProjectImpl {
-        public InternalWebProjectImpl(
-            @NotNull SessionContextImpl sessionContext,
-            @NotNull RMProject rmProject,
-            @NotNull Path projectPath
-        ) {
-            super(
-                BaseLocalResourceController.this.workspace,
-                BaseLocalResourceController.this,
-                sessionContext,
-                rmProject,
-                projectPath
-            );
-        }
-
-        @NotNull
-        @Override
-        protected DBPDataSourceRegistry createDataSourceRegistry() {
-            return new DataSourceRegistry(this);
-        }
-    }
-
     protected void fireRmResourceAddEvent(@NotNull String projectId, @NotNull String resourcePath) throws DBException {
         RMEventManager.fireEvent(
             new RMEvent(RMEvent.Action.RESOURCE_ADD,

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,24 +33,29 @@ import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMCredentials;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
-import org.jkiss.dbeaver.model.fs.lock.FileLockController;
+import org.jkiss.dbeaver.model.auth.SMObjectType;
+import org.jkiss.dbeaver.model.fs.lock.LockManager;
+import org.jkiss.dbeaver.model.fs.lock.LockOptions;
+import org.jkiss.dbeaver.model.fs.lock.LockTarget;
 import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
 import org.jkiss.dbeaver.model.impl.auth.SessionContextImpl;
 import org.jkiss.dbeaver.model.navigator.DBNLocalFolder;
+import org.jkiss.dbeaver.model.net.DBWNetworkProfile;
 import org.jkiss.dbeaver.model.rm.*;
-import org.jkiss.dbeaver.model.security.SMController;
-import org.jkiss.dbeaver.model.security.SMObjectType;
+import org.jkiss.dbeaver.model.security.SMAdminController;
 import org.jkiss.dbeaver.model.sql.DBQuotaException;
 import org.jkiss.dbeaver.model.websocket.event.MessageType;
 import org.jkiss.dbeaver.model.websocket.event.WSSessionLogUpdatedEvent;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDatasourceFolderEvent;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSNetworkProfileEvent;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceParseResults;
 import org.jkiss.dbeaver.registry.ResourceTypeDescriptor;
 import org.jkiss.dbeaver.registry.ResourceTypeRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
+import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.IOUtils;
 import org.jkiss.utils.Pair;
@@ -78,20 +83,22 @@ public class LocalResourceController extends BaseLocalResourceController {
     private final Path userProjectsPath;
     private final Path sharedProjectsPath;
     private final String globalProjectName;
-    private Supplier<SMController> smControllerSupplier;
+    private Supplier<SMAdminController> smControllerSupplier;
     protected final List<RMFileOperationHandler> fileHandlers;
 
     private final Map<String, RMLocalProject> projectRegistries = new LinkedHashMap<>();
+    private final ProjectsMetadataInfo sharedProjectsMetadataInfo;
 
     public LocalResourceController(
-        DBPWorkspace workspace,
-        SMCredentialsProvider credentialsProvider,
-        Path rootPath,
-        Path userProjectsPath,
-        Path sharedProjectsPath,
-        Supplier<SMController> smControllerSupplier
+        @NotNull DBPWorkspace workspace,
+        @NotNull SMCredentialsProvider credentialsProvider,
+        @NotNull Path rootPath,
+        @NotNull Path userProjectsPath,
+        @NotNull Path sharedProjectsPath,
+        @NotNull Supplier<SMAdminController> smControllerSupplier,
+        @NotNull LockManager lockController
     ) throws DBException {
-        super(workspace, new FileLockController(ServletAppUtils.getServletApplication().getApplicationInstanceId()));
+        super(workspace, lockController);
         this.credentialsProvider = credentialsProvider;
         this.rootPath = rootPath;
         this.userProjectsPath = userProjectsPath;
@@ -100,27 +107,34 @@ public class LocalResourceController extends BaseLocalResourceController {
 
         this.globalProjectName = DBWorkbench.getPlatform().getApplication().getDefaultProjectName();
         this.fileHandlers = RMFileOperationHandlersRegistry.getInstance().getFileHandlers();
+        this.sharedProjectsMetadataInfo = new ProjectsMetadataInfo(sharedProjectsPath, lockController);
     }
 
-    protected SMController getSecurityController() {
+    @NotNull
+    protected SMAdminController getSecurityController() {
         return smControllerSupplier.get();
     }
 
+    @Nullable
     private Path getGlobalProjectPath() {
         return globalProjectName == null ? null : this.rootPath.resolve(this.globalProjectName);
     }
 
+    @Nullable
     private Path getPrivateProjectPath() {
         SMCredentials activeUserCredentials = credentialsProvider.getActiveUserCredentials();
         String userId = activeUserCredentials == null ? null : activeUserCredentials.getUserId();
         return userId == null ? null : this.userProjectsPath.resolve(userId);
     }
 
-    protected RMLocalProject getWebProject(String projectId, boolean refresh) throws DBException {
+    protected RMLocalProject getWebProject(@NotNull String projectId, boolean refresh) throws DBException {
         synchronized (projectRegistries) {
             RMLocalProject project = projectRegistries.get(projectId);
             if (project == null || refresh) {
                 project = createWebProjectImpl(projectId, new SessionContextImpl(null));
+                if (project.getProjectType() == RMProjectType.SHARED) {
+                    project.setProjectInfo(sharedProjectsMetadataInfo.getProjectInfo(projectId));
+                }
                 projectRegistries.put(projectId, project);
             }
             return project;
@@ -167,11 +181,6 @@ public class LocalResourceController extends BaseLocalResourceController {
                 projects.add(0, userProject);
             }
         }
-        if (ServletAppUtils.getServletApplication().isMultiNode()) {
-            for (RMProject rmProject : projects) {
-                handleProjectOpened(rmProject.getId());
-            }
-        }
 
         projects.sort(Comparator.comparing(RMProject::getDisplayName));
         return projects.toArray(new RMProject[0]);
@@ -277,7 +286,7 @@ public class LocalResourceController extends BaseLocalResourceController {
                 throw new DBException("Error creating shared project path", e);
             }
         }
-        validateResourcePath(name);
+        GeneralUtils.validateResourceNameUnconditionally(name);
         validateProjectName(null, name);
         var projectPath = sharedProjectsPath.resolve(name);
         if (Files.exists(projectPath)) {
@@ -289,9 +298,6 @@ public class LocalResourceController extends BaseLocalResourceController {
         try {
             log.debug("Creating project '" + rmProject.getId() + "'");
             Files.createDirectories(projectPath);
-            if (ServletAppUtils.getServletApplication().isMultiNode()) {
-                createResourceTypeFolders(projectPath);
-            }
             fireRmProjectAddEvent(rmProject);
             return rmProject;
         } catch (IOException e) {
@@ -299,10 +305,11 @@ public class LocalResourceController extends BaseLocalResourceController {
         }
     }
 
+    @NotNull
     @Override
     public RMProject updateProject(@NotNull String projectId, @NotNull RMProjectInfo projectInfo) throws DBException {
         validateProjectName(projectId, projectInfo.getName());
-        try (var projectLock = lockController.lock(projectId, "updateProject")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("updateProject"))) {
             RMLocalProject project = getWebProject(projectId, false);
             Path targetPath = getProjectPath(projectId);
             if (!Files.exists(targetPath)) {
@@ -312,6 +319,7 @@ public class LocalResourceController extends BaseLocalResourceController {
                 throw new DBException("Project '" + projectId + "' is not shared");
             }
             project.updateProject(projectInfo.getName(), projectInfo.getDescription());
+            sharedProjectsMetadataInfo.updateProjectInfo(projectId, projectInfo);
             return WebRMUtils.createRmProjectFromWebProject(project);
         }
     }
@@ -328,26 +336,28 @@ public class LocalResourceController extends BaseLocalResourceController {
 
     @Override
     public void deleteProject(@NotNull String projectId) throws DBException {
-        try (var projectLock = lockController.lock(projectId, "deleteProject")) {
-            RMProject project = makeProjectFromId(projectId, false);
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("deleteProject"))) {
             Path targetPath = getProjectPath(projectId);
             if (!Files.exists(targetPath)) {
-                log.debug(MessageFormat.format("Project folder ''{0}'' is not found", projectId));
+                log.error(MessageFormat.format("Project folder ''{0}'' is not found", projectId));
                 return;
             }
             try {
-                log.debug("Deleting project '" + projectId + "'");
+                log.debug("Deleting project '" + projectId + "' in persistence storage");
+                getSecurityController().deleteObject(projectId, projectId, SMObjectType.project);
+                log.debug("Deleting project '" + projectId + "' folder");
                 IOUtils.deleteDirectory(targetPath);
-                getSecurityController().deleteAllObjectPermissions(projectId, SMObjectType.project);
                 synchronized (projectRegistries) {
                     projectRegistries.remove(projectId);
                 }
+                sharedProjectsMetadataInfo.updateProjectInfo(projectId, null);
             } catch (IOException e) {
-                throw new DBException("Error deleting project '" + project.getName() + "'", e);
+                throw new DBException("Error deleting project '" + projectId + "'", e);
             }
         }
     }
 
+    @Nullable
     @Override
     public RMProject getProject(@NotNull String projectId, boolean readResources, boolean readProperties) throws DBException {
         RMProject project = makeProjectFromId(projectId, true);
@@ -399,14 +409,28 @@ public class LocalResourceController extends BaseLocalResourceController {
                     registry::createDataSource
                 )
             );
+        Map<String, DBWNetworkProfile> oldNetworkProfiles = registry.getNetworkProfiles().getProfiles().stream()
+            .collect(Collectors.toMap(
+                DBWNetworkProfile::getProfileId,
+                p -> p
+            ));
         DataSourceParseResults parseResults = super.updateProjectDataSourcesConfig(projectId, configuration, dataSourceIds);
-        sendDataSourcesConfigUpdatedEvent(registry, oldDataSources, parseResults);
+        sendConfigUpdatedEvent(registry, oldDataSources, oldNetworkProfiles, parseResults);
         return parseResults != null;
     }
 
     @Override
     public void deleteProjectDataSources(@NotNull String projectId, @NotNull String[] dataSourceIds) throws DBException {
         super.deleteProjectDataSources(projectId, dataSourceIds);
+
+        log.debug("Delete datasources '" + Arrays.toString(dataSourceIds) + "' from security controller");
+        for (String dsId : dataSourceIds) {
+            try {
+                getSecurityController().deleteObject(projectId, dsId, SMObjectType.datasource);
+            } catch (DBException e) {
+                log.error("Error deleting datasource '" + dsId + "' from database");
+            }
+        }
         if (credentialsProvider.getActiveUserCredentials() != null && dataSourceIds.length > 0) {
             ServletAppUtils.getServletApplication().getEventController().addEvent(
                 WSDataSourceEvent.delete(
@@ -484,14 +508,48 @@ public class LocalResourceController extends BaseLocalResourceController {
         return DBNLocalFolder.makeLocalFolderItemPath(projectId, folderPath);
     }
 
-    private void sendDataSourcesConfigUpdatedEvent(
+    private void sendConfigUpdatedEvent(
         @NotNull DBPDataSourceRegistry registry,
         @NotNull Map<String, DataSourceDescriptor> oldDataSources,
+        @NotNull Map<String, DBWNetworkProfile> oldNetworkProfiles,
         @Nullable DataSourceParseResults parseResults
     ) {
-        if (parseResults == null || credentialsProvider.getActiveUserCredentials() == null || oldDataSources.isEmpty()) {
+        if (parseResults == null || credentialsProvider.getActiveUserCredentials() == null) {
             return;
         }
+        boolean profilesChanged = !parseResults.removedProfiles.isEmpty();
+
+        // We don't need to check for updated profiles if there are already added or removed profiles
+        if (!profilesChanged) {
+            for (DBWNetworkProfile updatedProfile : parseResults.updatedProfiles) {
+                if (oldNetworkProfiles.containsKey(updatedProfile.getProfileId())) {
+                    DBWNetworkProfile oldProfile = oldNetworkProfiles.get(updatedProfile.getProfileId());
+                    if (!oldProfile.equalConfigurations(updatedProfile)) {
+                        profilesChanged = true;
+                        break;
+                    }
+                } else {
+                    // profile was added
+                    profilesChanged = true;
+                    break;
+                }
+            }
+        }
+
+        if (profilesChanged) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSNetworkProfileEvent.update(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    registry.getProject().getId()
+                )
+            );
+        }
+
+        if (oldDataSources.isEmpty()) {
+            return;
+        }
+
         List<String> updatedConfigurationDataSourceIds = new ArrayList<>();
         List<String> updatedNameDataSourceIds = new ArrayList<>();
         List<String> updatedInternalConfigurationDataSourceIds = new ArrayList<>();
@@ -595,7 +653,6 @@ public class LocalResourceController extends BaseLocalResourceController {
                 )
             );
         }
-
     }
 
     @NotNull
@@ -614,7 +671,8 @@ public class LocalResourceController extends BaseLocalResourceController {
         }
         return doProjectOperation(projectId, () -> {
             try {
-                Path folderPath = CommonUtils.isEmpty(folder) ?
+                boolean projectFolder = CommonUtils.isEmpty(folder);
+                Path folderPath = projectFolder ?
                     projectPath :
                     projectPath.resolve(folder);
                 folderPath = folderPath.normalize();
@@ -623,7 +681,7 @@ public class LocalResourceController extends BaseLocalResourceController {
                     throw new DBException("Invalid folder path");
                 }
                 createFolder(folderPath);
-                return readChildResources(projectId, folderPath, nameMask, readProperties, readHistory, recursive);
+                return readChildResources(projectId, folderPath, nameMask, projectFolder, readProperties, readHistory, recursive);
             } catch (NoSuchFileException e) {
                 throw new DBException("Invalid resource folder " + folder);
             } catch (IOException e) {
@@ -637,29 +695,55 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull String projectId,
         @NotNull Path folderPath,
         @Nullable String nameMask,
+        boolean projectFolder,
         boolean readProperties,
         boolean readHistory,
         boolean recursive
     ) throws IOException {
         try (Stream<Path> files = Files.list(folderPath)) {
-            return files.filter(path -> {
+            Set<RMResource> children = files.filter(path -> {
                     String fileName = path.getFileName().toString();
                     return (nameMask == null || nameMask.equals(fileName)) && !fileName.startsWith(".");
                 }) // skip hidden files
-                .sorted(Comparator.comparing(path -> path.getFileName().toString(), String.CASE_INSENSITIVE_ORDER))
                 .map((Path path) -> makeResourceFromPath(projectId, path, nameMask, readProperties, readHistory, recursive))
                 .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+            if (ServletAppUtils.getServletApplication().isMultiNode() && projectFolder) {
+                addResourceTypeFolders(folderPath, children);
+            }
+            return children.stream()
+                .sorted(Comparator.comparing(RMResource::getName, String.CASE_INSENSITIVE_ORDER))
                 .toArray(RMResource[]::new);
         }
     }
 
+    private void addResourceTypeFolders(@NotNull Path projectPath, @NotNull Set<RMResource> children) {
+        Set<String> folderNames = children.stream()
+            .filter(RMResource::isFolder)
+            .map(RMResource::getName)
+            .collect(Collectors.toSet());
+        // fake resources for default resource type folders
+        for (ResourceTypeDescriptor type : ResourceTypeRegistry.getInstance().getResourceTypes()) {
+            String defaultRoot = type.getDefaultRoot(null);
+            if (CommonUtils.isEmpty(defaultRoot)) {
+                continue;
+            }
+            Path resourceFolder = projectPath.resolve(defaultRoot);
+            if (!folderNames.contains(resourceFolder.getFileName().toString())) {
+                RMResource resource = new RMResource(resourceFolder.getFileName().toString());
+                resource.setFolder(true);
+                children.add(resource);
+            }
+        }
+    }
+
     @Override
     public String createResource(
         @NotNull String projectId,
         @NotNull String resourcePath,
         boolean isFolder
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(projectId, "createResource")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("createResource"))) {
             validateResourcePath(resourcePath);
             Path targetPath = getTargetPath(projectId, resourcePath);
             if (Files.exists(targetPath)) {
@@ -691,7 +775,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull String oldResourcePath,
         @NotNull String newResourcePath
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(projectId, "moveResource")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("moveResource"))) {
             var normalizedOldResourcePath = CommonUtils.normalizeResourcePath(oldResourcePath);
             var normalizedNewResourcePath = CommonUtils.normalizeResourcePath(newResourcePath);
             if (log.isDebugEnabled()) {
@@ -763,7 +847,7 @@ public class LocalResourceController extends BaseLocalResourceController {
 
     @Override
     public void deleteResource(@NotNull String projectId, @NotNull String resourcePath, boolean recursive) throws DBException {
-        try (var ignoredLock = lockController.lock(projectId, "deleteResource")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("deleteResource"))) {
             if (log.isDebugEnabled()) {
                 log.debug("Removing resource from '" + resourcePath + "' in project '" + projectId + "'" + (recursive ? " recursive" : ""));
             }
@@ -851,7 +935,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull byte[] data,
         boolean forceOverwrite
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(projectId, "setResourceContents")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("setResourceContents"))) {
             validateResourcePath(resourcePath);
             Number fileSizeLimit = ServletAppUtils.getServletApplication()
                 .getAppConfiguration()
@@ -896,7 +980,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull String propertyName,
         @Nullable Object propertyValue
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(projectId, "resourcePropertyUpdate")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("resourcePropertyUpdate"))) {
             validateResourcePath(resourcePath);
             RMLocalProject webProject = getWebProject(projectId, false);
             doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
@@ -917,7 +1001,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         @NotNull String resourcePath,
         @NotNull Map<String, Object> properties
     ) throws DBException {
-        try (var ignoredLock = lockController.lock(projectId, "resourcePropertyUpdate")) {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("resourcePropertyUpdate"))) {
             validateResourcePath(resourcePath);
             RMLocalProject webProject = getWebProject(projectId, false);
             doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
@@ -944,8 +1028,24 @@ public class LocalResourceController extends BaseLocalResourceController {
         try {
             while (resourcePath.startsWith("/")) resourcePath = resourcePath.substring(1);
             Path targetPath = projectPath.resolve(resourcePath).normalize();
-            if (!targetPath.startsWith(projectPath)) {
-                throw new DBException("Invalid resource path");
+            // hack for custom path implementations that returns / as root path
+            Iterator<Path> projectParts = projectPath.iterator();
+            Iterator<Path> targetParts = targetPath.iterator();
+            Iterator<Path> unnormalizedTargetParts = projectPath.resolve(resourcePath).iterator();
+            while (projectParts.hasNext()) {
+                if (!targetParts.hasNext()) {
+                    throw new DBException("Invalid resource path");
+                }
+                Path projectPart = projectParts.next();
+                Path targetPart = targetParts.next();
+                unnormalizedTargetParts.next();
+                if (!projectPart.equals(targetPart)) {
+                    throw new DBException("Invalid resource path");
+                }
+            }
+            // validating unnormalized target parts to avoid invalid characters in resource names
+            while (unnormalizedTargetParts.hasNext()) {
+                GeneralUtils.validateResourceNameUnconditionally(unnormalizedTargetParts.next().toString());
             }
             return targetPath;
         } catch (InvalidPathException e) {
@@ -954,7 +1054,7 @@ public class LocalResourceController extends BaseLocalResourceController {
     }
 
     @Nullable
-    protected RMProject makeProjectFromId(String projectId, boolean loadPermissions) throws DBException {
+    protected RMProject makeProjectFromId(@NotNull String projectId, boolean loadPermissions) throws DBException {
         var projectName = WebRMUtils.parseProjectName(projectId);
         var projectPath = getProjectPath(projectId);
         if (!Files.exists(projectPath)) {
@@ -993,29 +1093,13 @@ public class LocalResourceController extends BaseLocalResourceController {
             .toArray(String[]::new);
 
         RMLocalProject webProject = new RMLocalProject(workspace, new SessionContextImpl(null), path, type);
+        if (type == RMProjectType.SHARED) {
+            webProject.setProjectInfo(sharedProjectsMetadataInfo.getProjectInfo(webProject.getId()));
+        }
         return createRmProjectFromWebProject(path, webProject, allProjectPermissions);
     }
 
-    private void createResourceTypeFolders(Path path) {
-        // FIXME: do not create folders by force!!!
-        var resourceTypes = ResourceTypeRegistry.getInstance().getResourceTypes();
-        for (var resourceType : resourceTypes) {
-            var defaultRoot = resourceType.getDefaultRoot(null);
-            if (defaultRoot == null) {
-                continue;
-            }
-            var typeFolder = path.resolve(defaultRoot);
-            try {
-                if (!Files.exists(typeFolder)) {
-                    createFolder(typeFolder);
-                }
-            } catch (Exception e) {
-                log.error("Resource folder " + typeFolder + " is not created", e);
-            }
-        }
-    }
-
-    protected <T> T doProjectOperation(String projectId, RMFileOperation<T> operation) throws DBException {
+    protected <T> T doProjectOperation(@NotNull String projectId, @NotNull RMFileOperation<T> operation) throws DBException {
         for (RMFileOperationHandler fileHandler : fileHandlers) {
             try {
                 fileHandler.projectOpened(projectId);
@@ -1033,7 +1117,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         return operation.doOperation();
     }
 
-    protected <T> T doFileReadOperation(String projectId, Path file, RMFileOperation<T> operation) throws DBException {
+    protected <T> T doFileReadOperation(@NotNull String projectId, @NotNull Path file, @NotNull RMFileOperation<T> operation) throws DBException {
         for (RMFileOperationHandler fileHandler : fileHandlers) {
             try {
                 fileHandler.beforeFileRead(projectId, file);
@@ -1052,7 +1136,11 @@ public class LocalResourceController extends BaseLocalResourceController {
         return operation.doOperation();
     }
 
-    protected <T> T doFileWriteOperation(String projectId, Path file, RMFileOperation<T> operation) throws DBException {
+    protected <T> T doFileWriteOperation(
+        @NotNull String projectId,
+        @NotNull Path file,
+        @NotNull RMFileOperation<T> operation
+    ) throws DBException {
         for (RMFileOperationHandler fileHandler : fileHandlers) {
             fileHandler.beforeFileChange(projectId, file);
         }
@@ -1071,10 +1159,11 @@ public class LocalResourceController extends BaseLocalResourceController {
         return result;
     }
 
-    protected Path getProjectPath(String projectId) throws DBException {
+    protected Path getProjectPath(@NotNull String projectId) throws DBException {
         RMProjectName project = WebRMUtils.parseProjectName(projectId);
         RMProjectType type = project.getType();
         String projectName = project.getName();
+        GeneralUtils.validateResourceNameUnconditionally(projectName);
         switch (type) {
             case GLOBAL:
                 if (!projectName.equals(globalProjectName)) {
@@ -1162,7 +1251,7 @@ public class LocalResourceController extends BaseLocalResourceController {
 
         if (recursive && resource.isFolder()) {
             try {
-                resource.setChildren(readChildResources(projectId, path, nameMask, readProperties, readHistory, true));
+                resource.setChildren(readChildResources(projectId, path, nameMask, false, readProperties, readHistory, true));
             } catch (IOException e) {
                 log.error(e);
             }
@@ -1176,16 +1265,14 @@ public class LocalResourceController extends BaseLocalResourceController {
         return getProjectPath(projectId).toAbsolutePath().relativize(path).toString().replace('\\', IPath.SEPARATOR);
     }
 
-    protected void handleProjectOpened(String projectId) throws DBException {
-        createResourceTypeFolders(getProjectPath(projectId));
-    }
-
+    @NotNull
     public static Builder builder(
-        SMCredentialsProvider credentialsProvider,
-        DBPWorkspace workspace,
-        Supplier<SMController> smControllerSupplier
+        @NotNull SMCredentialsProvider credentialsProvider,
+        @NotNull DBPWorkspace workspace,
+        @NotNull LockManager lockController,
+        @NotNull Supplier<SMAdminController> smControllerSupplier
     ) {
-        return new Builder(workspace, credentialsProvider, smControllerSupplier);
+        return new Builder(workspace, credentialsProvider, lockController, smControllerSupplier);
     }
 
     @Override
@@ -1195,16 +1282,19 @@ public class LocalResourceController extends BaseLocalResourceController {
 
     public static class Builder {
         protected final SMCredentialsProvider credentialsProvider;
-        protected final Supplier<SMController> smController;
+        protected final Supplier<SMAdminController> smController;
         protected final DBPWorkspace workspace;
 
         protected Path rootPath;
         protected Path userProjectsPath;
         protected Path sharedProjectsPath;
+        protected LockManager lockController;
 
         protected Builder(
-            DBPWorkspace workspace, SMCredentialsProvider credentialsProvider,
-            Supplier<SMController> smControllerSupplier
+            @NotNull DBPWorkspace workspace,
+            @NotNull SMCredentialsProvider credentialsProvider,
+            @NotNull LockManager lockController,
+            @NotNull Supplier<SMAdminController> smControllerSupplier
         ) {
             this.workspace = workspace;
             this.credentialsProvider = credentialsProvider;
@@ -1212,25 +1302,38 @@ public class LocalResourceController extends BaseLocalResourceController {
             this.rootPath = RMUtils.getRootPath();
             this.userProjectsPath = RMUtils.getUserProjectsPath();
             this.sharedProjectsPath = RMUtils.getSharedProjectsPath();
+            this.lockController = lockController;
         }
 
-        public Builder setRootPath(Path rootPath) {
+        @NotNull
+        public Builder setRootPath(@NotNull Path rootPath) {
             this.rootPath = rootPath;
             return this;
         }
 
-        public Builder setUserProjectsPath(Path userProjectsPath) {
+        @NotNull
+        public Builder setUserProjectsPath(@NotNull Path userProjectsPath) {
             this.userProjectsPath = userProjectsPath;
             return this;
         }
 
-        public Builder setSharedProjectsPath(Path sharedProjectsPath) {
+        @NotNull
+        public Builder setSharedProjectsPath(@NotNull Path sharedProjectsPath) {
             this.sharedProjectsPath = sharedProjectsPath;
             return this;
         }
 
+        @NotNull
         public LocalResourceController build() throws DBException {
-            return new LocalResourceController(workspace, credentialsProvider, rootPath, userProjectsPath, sharedProjectsPath, smController);
+            return new LocalResourceController(
+                workspace,
+                credentialsProvider,
+                rootPath,
+                userProjectsPath,
+                sharedProjectsPath,
+                smController,
+                lockController
+            );
         }
     }
 
@@ -1271,7 +1374,7 @@ public class LocalResourceController extends BaseLocalResourceController {
         // Resource types
         project.setResourceTypes(ResourceTypeRegistry.getInstance().getResourceTypes()
             .stream()
-            .filter(ResourceTypeDescriptor::isManagable)
+            .filter(ResourceTypeDescriptor::isManageable)
             .map(RMResourceType::new)
             .toArray(RMResourceType[]::new));
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/ProjectsMetadataInfo.java

@@ -0,0 +1,152 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.rm.local;
+
+import com.google.gson.reflect.TypeToken;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.app.DBPProject;
+import org.jkiss.dbeaver.model.data.json.JSONUtils;
+import org.jkiss.dbeaver.model.fs.lock.LockManager;
+import org.jkiss.dbeaver.model.fs.lock.LockOptions;
+import org.jkiss.dbeaver.model.fs.lock.LockTarget;
+import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
+import org.jkiss.dbeaver.model.rm.RMProjectInfo;
+import org.jkiss.dbeaver.model.rm.RMProjectType;
+import org.jkiss.dbeaver.model.rm.RMUtils;
+import org.jkiss.utils.CommonUtils;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Stream;
+
+public class ProjectsMetadataInfo {
+    private static final Log log = Log.getLog(ProjectsMetadataInfo.class);
+    private static final String PROJECTS_INFO_FILE_NAME = "projects-info.json";
+
+    private final Map<String, RMProjectInfo> projectsInfo = new LinkedHashMap<>();
+    private final Path projectsPath;
+    private final LockManager lockController;
+
+
+    public ProjectsMetadataInfo(@NotNull Path projectsPath, @NotNull LockManager lockController) throws DBException {
+        this.projectsPath = projectsPath;
+        this.lockController = lockController;
+        readProjectInfos(projectsPath);
+    }
+
+    public RMProjectInfo getProjectInfo(@NotNull String projectId) {
+        return projectsInfo.computeIfAbsent(projectId, key -> new RMProjectInfo());
+    }
+
+    public void updateProjectInfo(@NotNull String projectId, @Nullable RMProjectInfo projectInfo) {
+        if (projectInfo != null) {
+            projectsInfo.put(projectId, projectInfo);
+        } else {
+            projectsInfo.remove(projectId);
+        }
+        saveProjectsInfo();
+    }
+
+    private void readProjectInfos(@NotNull Path path) {
+        if (!Files.exists(path)) {
+            return;
+        }
+        Path projectInfoFile = path.resolve(PROJECTS_INFO_FILE_NAME);
+        if (!Files.exists(projectInfoFile)) {
+            loadAndMigrateProjectDataToCommonFile(path);
+            saveProjectsInfo();
+            return;
+        }
+        readProjectInfosFromFile(projectInfoFile);
+    }
+
+    private void readProjectInfosFromFile(@NotNull Path projectInfoFile) {
+        try {
+            log.info("Reading project metadata information");
+            String content = Files.readString(projectInfoFile, StandardCharsets.UTF_8);
+            Map<String, RMProjectInfo> loaded = JSONUtils.GSON.fromJson(
+                content,
+                TypeToken.getParameterized(Map.class, String.class, RMProjectInfo.class).getType()
+            );
+            projectsInfo.clear();
+            if (loaded != null) {
+                projectsInfo.putAll(loaded);
+            }
+        } catch (IOException e) {
+            log.error("Error reading existing " + PROJECTS_INFO_FILE_NAME, e);
+        }
+    }
+
+    private void loadAndMigrateProjectDataToCommonFile(@NotNull Path path) {
+        log.info("Migrating shared project information to the common place");
+        Map<String, RMProjectInfo> infos = new LinkedHashMap<>();
+        try (Stream<Path> stream = Files.list(path)) {
+            stream.filter(Files::isDirectory).forEach(projectDir -> {
+                RMProjectInfo info = getProjectInfoFromProjectSettings(projectDir);
+                String projectId = RMUtils.makeProjectIdFromPath(projectDir, RMProjectType.SHARED);
+                infos.put(projectId, info);
+            });
+        } catch (IOException e) {
+            log.error("Error listing shared projects path", e);
+        }
+        log.info("Migration for project information completed");
+        projectsInfo.clear();
+        projectsInfo.putAll(infos);
+    }
+
+    @NotNull
+    private RMProjectInfo getProjectInfoFromProjectSettings(@NotNull Path projectPath) {
+        String name = null;
+        String description = null;
+
+        Path settings = projectPath.resolve(DBPProject.METADATA_FOLDER).resolve(BaseProjectImpl.SETTINGS_STORAGE_FILE);
+        if (Files.exists(settings) && Files.isRegularFile(settings)) {
+            try {
+                String json = Files.readString(settings, StandardCharsets.UTF_8);
+                Map<String, Object> map = JSONUtils.GSON.fromJson(json, JSONUtils.MAP_TYPE_TOKEN);
+                name = JSONUtils.getString(map, BaseProjectImpl.PROP_PROJECT_NAME);
+                description = JSONUtils.getString(map, BaseProjectImpl.PROP_PROJECT_DESCRIPTION);
+            } catch (IOException e) {
+                log.warn("Failed to read project settings for " + projectPath + ": " + e.getMessage());
+            } catch (Exception e) {
+                log.warn("Failed to parse project settings for " + projectPath + ": " + e.getMessage());
+            }
+        }
+        RMProjectInfo info = new RMProjectInfo();
+        info.setName(CommonUtils.isEmpty(name) ? projectPath.getFileName().toString() : name);
+        info.setDescription(description);
+        return info;
+    }
+
+    private void saveProjectsInfo() {
+        try (var lock = lockController.lock(LockTarget.of(PROJECTS_INFO_FILE_NAME), LockOptions.of("saveProjectsInfo"))) {
+            log.info("Saving project information");
+            Files.writeString(projectsPath.resolve(PROJECTS_INFO_FILE_NAME), JSONUtils.GSON.toJson(projectsInfo));
+        } catch (IOException e) {
+            log.error("Error writing " + PROJECTS_INFO_FILE_NAME, e);
+        } catch (DBException e) {
+            log.error("Error locking file " + PROJECTS_INFO_FILE_NAME + ": " + e.getMessage());
+        }
+    }
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/RMLocalProject.java

@@ -18,24 +18,21 @@ package io.cloudbeaver.model.rm.local;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
+import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
-import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
+import org.jkiss.dbeaver.model.rm.RMProjectInfo;
 import org.jkiss.dbeaver.model.rm.RMProjectType;
 import org.jkiss.dbeaver.model.rm.RMUtils;
-import org.jkiss.dbeaver.registry.DataSourceRegistry;
-import org.jkiss.utils.CommonUtils;
-import org.jkiss.utils.Pair;
+import org.jkiss.dbeaver.registry.project.LocalProjectImpl;
 
 import java.nio.file.Path;
-import java.util.Collection;
 
-public class RMLocalProject extends BaseProjectImpl {
-    @NotNull
-    private final Path projectPath;
+public class RMLocalProject extends LocalProjectImpl {
     @NotNull
     private final RMProjectType projectType;
+    @Nullable
+    private RMProjectInfo projectInfo;
 
     public RMLocalProject(
         @NotNull DBPWorkspace workspace,
@@ -43,12 +40,10 @@ public class RMLocalProject extends BaseProjectImpl {
         @NotNull Path projectPath,
         @NotNull RMProjectType type
     ) {
-        super(workspace, sessionContext);
-        this.projectPath = projectPath;
+        super(workspace, sessionContext, projectPath);
         this.projectType = type;
     }
 
-
     @Override
     public boolean isVirtual() {
         return true;
@@ -60,88 +55,41 @@ public class RMLocalProject extends BaseProjectImpl {
         return RMUtils.makeProjectIdFromPath(projectPath, projectType);
     }
 
-    @NotNull
+    @Nullable
     @Override
-    public String getName() {
-        Object projectName = this.getProjectProperty(PROP_PROJECT_NAME);
-        if (projectName != null) {
-            return projectName.toString();
+    public String getDescription() {
+        if (projectInfo == null) {
+            return null;
         }
-        return projectPath.getFileName().toString();
+        return projectInfo.getDescription();
     }
 
     @NotNull
     @Override
-    public Path getAbsolutePath() {
-        return projectPath;
+    public String getName() {
+        if (projectInfo == null || projectInfo.getName() == null) {
+            return projectPath.getFileName().toString();
+        }
+        return projectInfo.getName();
+    }
+
+    @NotNull
+    public RMProjectType getProjectType() {
+        return projectType;
     }
 
     @Override
-    public boolean isOpen() {
-        return true;
+    public void updateProject(@Nullable String newName, @Nullable String description) throws DBException {
+        this.projectInfo = new RMProjectInfo();
+        projectInfo.setName(newName);
+        projectInfo.setDescription(description);
     }
 
-    @Override
-    public void ensureOpen() {
-
-    }
-
-    @Override
-    public boolean isUseSecretStorage() {
-        return false;
-    }
-
-    public Path getMetadataFilePath() {
-        return getMetadataPath().resolve(METADATA_STORAGE_FILE);
-    }
-
-    /**
-     * Method for Bulk Update of resources properties paths
-     *
-     * @param oldToNewPaths collection of OldPath to NewPath pairs
-     */
-    public void moveResourcePropertiesBatch(@NotNull Collection<Pair<String, String>> oldToNewPaths) {
-        loadMetadata();
-        synchronized (metadataSync) {
-            for (var pathsPair : oldToNewPaths) {
-                final var oldResourcePath = CommonUtils.normalizeResourcePath(pathsPair.getFirst());
-                final var newResourcePath = CommonUtils.normalizeResourcePath(pathsPair.getSecond());
-                final var resProps = resourceProperties.remove(oldResourcePath);
-                if (resProps != null) {
-                    resourceProperties.put(newResourcePath, resProps);
-                }
-            }
-        }
-        flushMetadata();
-    }
-
-    /**
-     * Method for Bulk Remove of resources properties
-     */
-    public boolean resetResourcesPropertiesBatch(@NotNull Collection<String> resourcesPaths) {
-        loadMetadata();
-        boolean propertiesChanged = false;
-        synchronized (metadataSync) {
-            for (var resourcePath : resourcesPaths) {
-                var removedProperties = resourceProperties.remove(CommonUtils.normalizeResourcePath(resourcePath));
-                if (removedProperties != null) {
-                    propertiesChanged = true;
-                }
-            }
-        }
-        if (propertiesChanged) {
-            flushMetadata();
-        }
-        return propertiesChanged;
+    public void setProjectInfo(@NotNull RMProjectInfo projectInfo) {
+        this.projectInfo = projectInfo;
     }
 
     public boolean canUpdateProjectName() {
         return RMProjectType.SHARED.equals(projectType);
     }
-
-    @NotNull
-    @Override
-    protected DBPDataSourceRegistry createDataSourceRegistry() {
-        return new DataSourceRegistry<>(this);
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/BaseWebSession.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import io.cloudbeaver.model.app.ServletApplication;
 import io.cloudbeaver.model.app.ServletAuthApplication;
 import io.cloudbeaver.websocket.CBWebSessionEventHandler;
 import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.auth.SMAuthInfo;
@@ -29,8 +28,8 @@ import org.jkiss.dbeaver.model.auth.SMAuthSpace;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
 import org.jkiss.dbeaver.model.auth.impl.AbstractSessionPersistent;
 import org.jkiss.dbeaver.model.meta.Property;
-import org.jkiss.dbeaver.model.security.user.SMTeam;
 import org.jkiss.dbeaver.model.rm.RMProjectInfo;
+import org.jkiss.dbeaver.model.security.user.SMTeam;
 import org.jkiss.dbeaver.model.websocket.event.WSEvent;
 import org.jkiss.dbeaver.model.websocket.event.WSEventDeleteTempFile;
 import org.jkiss.dbeaver.model.websocket.event.session.WSSessionExpiredEvent;
@@ -56,14 +55,21 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
     @NotNull
     protected final ServletApplication application;
     protected volatile long lastAccessTime;
+    @NotNull
+    private final SessionType sessionType;
 
     private final List<CBWebSessionEventHandler> sessionEventHandlers = new CopyOnWriteArrayList<>();
     private WebSessionEventsFilter eventsFilter;
     private final WebSessionWorkspace workspace;
 
-    public BaseWebSession(@NotNull String id, @NotNull ServletApplication application) throws DBException {
+    public BaseWebSession(
+        @NotNull String id,
+        @NotNull ServletApplication application,
+        @NotNull SessionType sessionType
+    ) throws DBException {
         this.id = id;
         this.application = application;
+        this.sessionType = sessionType;
         this.createTime = System.currentTimeMillis();
         this.lastAccessTime = this.createTime;
         this.workspace = createWebWorkspace();
@@ -103,7 +109,7 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
         }
     }
 
-    public abstract void addSessionError(Throwable exception);
+    public abstract void addSessionError(@NotNull Throwable exception);
 
     public void addEventHandler(@NotNull CBWebSessionEventHandler handler) {
         synchronized (sessionEventHandlers) {
@@ -117,11 +123,21 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
         }
     }
 
-    public synchronized boolean updateSMSession(SMAuthInfo smAuthInfo) throws DBException {
+    public void migrateEventHandlersTo(@NotNull BaseWebSession target) {
+        synchronized (sessionEventHandlers) {
+            for (CBWebSessionEventHandler handler : sessionEventHandlers) {
+                handler.migrateToSession(target);
+                target.addEventHandler(handler);
+            }
+            sessionEventHandlers.clear();
+        }
+    }
+
+    public boolean updateSMSession(SMAuthInfo smAuthInfo) throws DBException {
         return userContext.refresh(smAuthInfo);
     }
 
-    public synchronized void refreshUserData() {
+    public void refreshUserData() {
         try {
             userContext.refreshPermissions();
             if (userContext.isAuthorizedInSecurityManager()) {
@@ -151,8 +167,8 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
         return workspace.getAuthContext();
     }
 
-    protected void clearSessionContext() {
-        this.workspace.getAuthContext().clear();
+    protected synchronized void clearSessionContext() {
+        this.workspace.getAuthContext().clearContext(false);
         this.workspace.getAuthContext().addSession(this);
     }
 
@@ -177,27 +193,33 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
         return lastAccessTime;
     }
 
-    public synchronized void touchSession() {
+    @NotNull
+    public SessionType getSessionType() {
+        return sessionType;
+    }
+
+    public void touchSession() {
         this.lastAccessTime = System.currentTimeMillis();
     }
 
     @NotNull
-    public synchronized WebUserContext getUserContext() {
+    public WebUserContext getUserContext() {
         return userContext;
     }
 
     @Override
     public void close() {
-        super.close();
         cleanUpSession(true);
+        super.close();
     }
 
     public void close(boolean clearTokens, boolean sendSessionExpiredEvent) {
         cleanUpSession(sendSessionExpiredEvent);
+        super.close();
     }
 
     private void cleanUpSession(boolean sendSessionExpiredEvent) {
-        application.getEventController().addEvent(new WSEventDeleteTempFile(getSessionId()));
+        application.getEventController().addEvent(new WSEventDeleteTempFile(getUserContext().getSmSessionId()));
         synchronized (sessionEventHandlers) {
             var sessionExpiredEvent = new WSSessionExpiredEvent();
             for (CBWebSessionEventHandler sessionEventHandler : sessionEventHandlers) {
@@ -227,7 +249,7 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
         this.eventsFilter = eventsFilter;
     }
 
-    public boolean isProjectAccessible(String projectId) {
+    public boolean isProjectAccessible(@NotNull String projectId) {
         return userContext.getAccessibleProjectIds().contains(projectId);
     }
 
@@ -240,11 +262,11 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
     }
 
 
-    public void removeSessionProject(@Nullable String projectId) throws DBException {
+    public void removeSessionProject(@NotNull String projectId) throws DBException {
         userContext.getAccessibleProjectIds().remove(projectId);
     }
 
-    public abstract void addSessionMessage(WebServerMessage message);
+    public abstract void addSessionMessage(@NotNull WebServerMessage message);
 
     @Property
     public boolean isValid() {
@@ -254,8 +276,12 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
     @Property
     public long getRemainingTime() {
         if (application instanceof ServletAuthApplication authApplication) {
-            return authApplication.getMaxSessionIdleTime() + lastAccessTime - System.currentTimeMillis();
+            return getMaxSessionIdleTime(authApplication) + lastAccessTime - System.currentTimeMillis();
         }
         return Integer.MAX_VALUE;
     }
+
+    protected long getMaxSessionIdleTime(@NotNull ServletAuthApplication authApplication) {
+        return authApplication.getMaxSessionIdleTime();
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/SessionType.java

@@ -0,0 +1,23 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.session;
+
+public enum SessionType {
+    WEB,
+    HEADLESS,
+    API_TOKEN
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebAuthInfo.java

@@ -41,6 +41,7 @@ public class WebAuthInfo implements SMSessionPrincipal, WebUserAuthToken {
 
     private final WebSession session;
     private final WebUser user;
+    @NotNull
     private final WebAuthProviderDescriptor authProvider;
     private String authProviderConfigurationId;
     @NotNull
@@ -71,6 +72,7 @@ public class WebAuthInfo implements SMSessionPrincipal, WebUserAuthToken {
         this.loginTime = loginTime;
     }
 
+    @NotNull
     @Property
     public OffsetDateTime getLoginTime() {
         return loginTime;
@@ -91,16 +93,19 @@ public class WebAuthInfo implements SMSessionPrincipal, WebUserAuthToken {
         return new WebUserOriginInfo(session, user, authProvider);
     }
 
+    @NotNull
     @Property
     public String getUserId() {
         return userIdentity.getId();
     }
 
+    @NotNull
     @Property
     public String getDisplayName() {
         return userIdentity.getDisplayName();
     }
 
+    @NotNull
     @Property
     public String getAuthProvider() {
         return authProvider.getId();
@@ -138,13 +143,11 @@ public class WebAuthInfo implements SMSessionPrincipal, WebUserAuthToken {
     }
 
     void closeAuth() {
-        if (authProvider != null && authSession != null) {
-            try {
-                SMAuthProvider authProviderInstance = this.authProvider.getInstance();
-                authProviderInstance.closeSession(session, authSession);
-            } catch (Exception e) {
-                log.error(e);
-            }
+        try {
+            SMAuthProvider authProviderInstance = this.authProvider.getInstance();
+            authProviderInstance.closeSession(session, authSession);
+        } catch (Exception e) {
+            log.error(e);
         }
     }
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebHeadlessSession.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,16 +31,16 @@ public class WebHeadlessSession extends BaseWebSession {
         @NotNull String id,
         @NotNull ServletAuthApplication application
     ) throws DBException {
-        super(id, application);
+        super(id, application, SessionType.HEADLESS);
     }
 
     @Override
-    public void addSessionError(Throwable exception) {
+    public void addSessionError(@NotNull Throwable exception) {
 
     }
 
     @Override
-    public void addSessionMessage(WebServerMessage message) {
+    public void addSessionMessage(@NotNull WebServerMessage message) {
 
     }
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebHttpRequestInfo.java

@@ -17,6 +17,7 @@
 package io.cloudbeaver.model.session;
 
 import jakarta.servlet.http.HttpServletRequest;
+import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.utils.HttpConstants;
 
@@ -31,12 +32,16 @@ public class WebHttpRequestInfo {
     private final String lastRemoteAddress;
     @Nullable
     private final String lastRemoteUserAgent;
+    @NotNull
+    private final SessionType sessionType;
 
     public WebHttpRequestInfo(HttpServletRequest request) {
-        this.id = request.getSession() == null ? null : request.getSession().getId();
-        this.locale = request.getAttribute("locale");
-        this.lastRemoteAddress = request.getRemoteAddr();
-        this.lastRemoteUserAgent = request.getHeader(USER_AGENT);
+        this(
+            request.getSession() == null ? null : request.getSession().getId(),
+            request.getAttribute("locale"),
+            request.getRemoteAddr(),
+            request.getHeader(USER_AGENT)
+        );
     }
 
     public WebHttpRequestInfo(
@@ -44,13 +49,25 @@ public class WebHttpRequestInfo {
         @Nullable Object locale,
         @Nullable String lastRemoteAddress,
         @Nullable String lastRemoteUserAgent
+    ) {
+        this(id, locale, lastRemoteAddress, lastRemoteUserAgent, SessionType.WEB);
+    }
+
+    public WebHttpRequestInfo(
+        @Nullable String id,
+        @Nullable Object locale,
+        @Nullable String lastRemoteAddress,
+        @Nullable String lastRemoteUserAgent,
+        @NotNull SessionType sessionType
     ) {
         this.id = id;
         this.locale = locale;
         this.lastRemoteAddress = lastRemoteAddress;
         this.lastRemoteUserAgent = lastRemoteUserAgent;
+        this.sessionType = sessionType;
     }
 
+    @Nullable
     public String getId() {
         return id;
     }
@@ -69,4 +86,9 @@ public class WebHttpRequestInfo {
     public String getLastRemoteUserAgent() {
         return lastRemoteUserAgent;
     }
+
+    @NotNull
+    public SessionType getSessionType() {
+        return sessionType;
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,7 @@
 package io.cloudbeaver.model.session;
 
 import io.cloudbeaver.*;
-import io.cloudbeaver.model.CustomCancelableJob;
-import io.cloudbeaver.model.WebAsyncTaskInfo;
-import io.cloudbeaver.model.WebConnectionInfo;
-import io.cloudbeaver.model.WebServerMessage;
+import io.cloudbeaver.model.*;
 import io.cloudbeaver.model.app.ServletApplication;
 import io.cloudbeaver.model.app.ServletAuthApplication;
 import io.cloudbeaver.model.session.monitor.TaskProgressMonitor;
@@ -30,7 +27,6 @@ import io.cloudbeaver.service.sql.WebSQLConstants;
 import io.cloudbeaver.utils.CBModelConstants;
 import io.cloudbeaver.utils.WebDataSourceUtils;
 import io.cloudbeaver.utils.WebEventUtils;
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.jkiss.code.NotNull;
@@ -38,6 +34,7 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBFileController;
+import org.jkiss.dbeaver.model.DBPAdaptable;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBPEventListener;
 import org.jkiss.dbeaver.model.access.DBAAuthCredentials;
@@ -45,7 +42,6 @@ import org.jkiss.dbeaver.model.access.DBACredentialsProvider;
 import org.jkiss.dbeaver.model.auth.*;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.exec.DBCException;
-import org.jkiss.dbeaver.model.fs.DBFFileSystemManager;
 import org.jkiss.dbeaver.model.meta.Association;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.navigator.DBNModel;
@@ -66,8 +62,10 @@ import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
 import java.time.Instant;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;
 /**
  * Web session.
@@ -75,16 +73,16 @@ import java.util.stream.Collectors;
  */
 //TODO: split to authenticated and non authenticated context
 public class WebSession extends BaseWebSession
-    implements SMSessionWithAuth, SMCredentialsProvider, DBACredentialsProvider, IAdaptable {
+    implements SMSessionWithAuth, SMCredentialsProvider, DBACredentialsProvider, DBPAdaptable {
 
     private static final Log log = Log.getLog(WebSession.class);
 
     public static final SMSessionType CB_SESSION_TYPE = new SMSessionType("CloudBeaver");
     private static final String WEB_SESSION_AUTH_CONTEXT_TYPE = "web-session";
-    private static final String ATTR_LOCALE = "locale";
     private static final AtomicInteger TASK_ID = new AtomicInteger();
 
     public static String RUNTIME_PARAM_AUTH_INFOS = "auth-infos";
+    public static String RUNTIME_PARAM_CLIENT_ORIGIN = "client-origin";
     private final AtomicInteger taskCount = new AtomicInteger();
 
     private final String lastRemoteAddr;
@@ -92,31 +90,34 @@ public class WebSession extends BaseWebSession
 
     private String locale;
     private boolean cacheExpired;
+    private String clientOrigin;
 
     protected WebSessionGlobalProjectImpl globalProject;
     private final List<WebServerMessage> sessionMessages = new ArrayList<>();
 
     private final Map<String, WebAsyncTaskInfo> asyncTasks = new HashMap<>();
-    private final Map<String, Function<Object, Object>> attributeDisposers = new HashMap<>();
 
     // Map of auth tokens. Key is authentication provider
     private final List<WebAuthInfo> authTokens = new ArrayList<>();
 
     private DBNModel navigatorModel;
+    private final ReadWriteLock navigatorModelLock = new ReentrantReadWriteLock(true);
     private final DBRProgressMonitor progressMonitor = new SessionProgressMonitor();
-    private final Map<String, DBWSessionHandler> sessionHandlers;
+    private final Map<String, DBWSessionHandler<WebSession>> sessionHandlers;
     private final WebDataSourceConnectEventListener connectListener = new WebDataSourceConnectEventListener(this);
 
     public WebSession(
         @NotNull WebHttpRequestInfo requestInfo,
         @NotNull ServletAuthApplication application,
-        @NotNull Map<String, DBWSessionHandler> sessionHandlers
+        @NotNull Map<String, DBWSessionHandler<WebSession>> sessionHandlers
     ) throws DBException {
-        this(requestInfo.getId(),
+        this(
+            Objects.requireNonNull(requestInfo.getId()),
             CommonUtils.toString(requestInfo.getLocale()),
             application,
             sessionHandlers,
-            requestInfo.getLastRemoteAddress()
+            requestInfo.getLastRemoteAddress(),
+            requestInfo.getSessionType()
         );
         updateSessionParameters(requestInfo);
     }
@@ -125,10 +126,21 @@ public class WebSession extends BaseWebSession
         @NotNull String id,
         @Nullable String locale,
         @NotNull ServletApplication application,
-        @NotNull Map<String, DBWSessionHandler> sessionHandlers,
-        @NotNull String remoteAddr
+        @NotNull Map<String, DBWSessionHandler<WebSession>> sessionHandlers,
+        @Nullable String remoteAddr
     ) throws DBException {
-        super(id, application);
+        this(id, locale, application, sessionHandlers, remoteAddr, SessionType.WEB);
+    }
+
+    protected WebSession(
+        @NotNull String id,
+        @Nullable String locale,
+        @NotNull ServletApplication application,
+        @NotNull Map<String, DBWSessionHandler<WebSession>> sessionHandlers,
+        @Nullable String remoteAddr,
+        @NotNull SessionType sessionType
+    ) throws DBException {
+        super(id, application, sessionType);
         if (CommonUtils.isEmpty(remoteAddr)) {
             throw new DBException("Remote address cannot be empty");
         }
@@ -151,7 +163,7 @@ public class WebSession extends BaseWebSession
             if (authTokens.isEmpty()) {
                 return null;
             }
-            return authTokens.get(0);
+            return authTokens.getFirst();
         }
     }
 
@@ -188,11 +200,12 @@ public class WebSession extends BaseWebSession
         this.cacheExpired = cacheExpired;
     }
 
-    public synchronized WebUser getUser() {
+    public WebUser getUser() {
         return this.userContext.getUser();
     }
 
-    public synchronized Map<String, String> getUserMetaParameters() {
+    @NotNull
+    public Map<String, String> getUserMetaParameters() {
         var user = getUser();
         if (user == null) {
             return Map.of();
@@ -204,20 +217,20 @@ public class WebSession extends BaseWebSession
         return allMetaParams;
     }
 
-    public synchronized String getUserId() {
+    public String getUserId() {
         return userContext.getUserId();
     }
 
     public synchronized boolean hasPermission(String perm) {
-        return getSessionPermissions().contains(DBWConstants.PERMISSION_ADMIN) ||
-            getSessionPermissions().contains(perm);
+        Set<String> sessionPermissions = getSessionPermissions();
+        return sessionPermissions.contains(DBWConstants.PERMISSION_ADMIN) || sessionPermissions.contains(perm);
     }
 
-    public synchronized boolean isAuthorizedInSecurityManager() {
+    public boolean isAuthorizedInSecurityManager() {
         return userContext.isAuthorizedInSecurityManager();
     }
 
-    public synchronized Set<String> getSessionPermissions() {
+    public Set<String> getSessionPermissions() {
         if (userContext.getUserPermissions() == null) {
             refreshSessionAuth();
         }
@@ -225,28 +238,30 @@ public class WebSession extends BaseWebSession
     }
 
     @NotNull
-    public synchronized SMController getSecurityController() {
+    public SMController getSecurityController() {
         return userContext.getSecurityController();
     }
 
     @NotNull
-    public synchronized SMAdminController getAdminSecurityController() throws DBException {
+    public SMAdminController getAdminSecurityController() throws DBException {
         if (!hasPermission(DBWConstants.PERMISSION_ADMIN)) {
             throw new DBException("Admin permissions required");
         }
         return userContext.getAdminSecurityController();
     }
 
-    public synchronized RMController getRmController() {
+    @NotNull
+    public RMController getRmController() {
         return userContext.getRmController();
     }
 
-    public synchronized DBFileController getFileController() {
+    @NotNull
+    public DBFileController getFileController() {
         return userContext.getFileController();
     }
 
     @Override
-    public synchronized void refreshUserData() {
+    public void refreshUserData() {
         super.refreshUserData();
         refreshSessionAuth();
 
@@ -254,39 +269,58 @@ public class WebSession extends BaseWebSession
     }
 
     // Note: for admin use only
-    public synchronized void resetUserState() throws DBException {
+    public void resetUserState(boolean needResetUserCache) throws DBException {
         clearAuthTokens();
-        try {
-            resetSessionCache();
-        } catch (DBCException e) {
-            addSessionError(e);
-            log.error(e);
+        if (needResetUserCache) {
+            try {
+                resetSessionCache();
+            } catch (DBCException e) {
+                addSessionError(e);
+                log.error(e);
+            }
         }
         refreshUserData();
         clearSessionContext();
     }
 
+    public void resetUserState() throws DBException {
+        resetUserState(true);
+    }
+
     @NotNull
     public DBPEventListener getDataSourceConnectListener() {
         return connectListener;
     }
 
+    @NotNull
+    public String getClientOrigin() {
+        return clientOrigin;
+    }
+
+    public void updateClientOrigin(@NotNull String originFromRequest) {
+        this.clientOrigin = originFromRequest;
+    }
+
     private void initNavigatorModel() {
+        navigatorModelLock.writeLock().lock();
+        try {
+            // Cleanup current data
+            if (this.navigatorModel != null) {
+                this.navigatorModel.dispose();
+                this.navigatorModel = null;
+            }
+            this.globalProject = null;
 
-        // Cleanup current data
-        if (this.navigatorModel != null) {
-            this.navigatorModel.dispose();
-            this.navigatorModel = null;
+            loadProjects();
+
+            this.navigatorModel = new DBNModel(DBWorkbench.getPlatform(), getWorkspace());
+            this.navigatorModel.setModelAuthContext(getWorkspace().getAuthContext());
+            this.navigatorModel.initialize();
+
+            this.locale = Locale.getDefault().getLanguage();
+        } finally {
+            navigatorModelLock.writeLock().unlock();
         }
-        this.globalProject = null;
-
-        loadProjects();
-
-        this.navigatorModel = new DBNModel(DBWorkbench.getPlatform(), getWorkspace().getProjects());
-        this.navigatorModel.setModelAuthContext(getWorkspace().getAuthContext());
-        this.navigatorModel.initialize();
-
-        this.locale = Locale.getDefault().getLanguage();
     }
 
     private void loadProjects() {
@@ -309,7 +343,7 @@ public class WebSession extends BaseWebSession
                 anonymousProject.setInMemory(true);
             }
             if (workspace.getActiveProject() == null && !workspace.getProjects().isEmpty()) {
-                workspace.setActiveProject(workspace.getProjects().get(0));
+                workspace.setActiveProject(workspace.getProjects().getFirst());
             }
         } catch (DBException e) {
             addSessionError(e);
@@ -317,14 +351,14 @@ public class WebSession extends BaseWebSession
         }
     }
 
-    private WebSessionProjectImpl createWebProject(RMProject project) throws DBException {
+    @NotNull
+    private WebSessionProjectImpl createWebProject(@NotNull RMProject project) throws DBException {
         WebSessionProjectImpl sessionProject;
         if (project.isGlobal()) {
             sessionProject = createGlobalProject(project);
         } else {
             sessionProject = createSessionProject(project);
         }
-        sessionProject.refreshProjectSettings();
         // do not load data sources for anonymous project
         if (project.getType() == RMProjectType.USER && userContext.getUser() == null) {
             sessionProject.setInMemory(true);
@@ -333,13 +367,10 @@ public class WebSession extends BaseWebSession
         if (!project.isShared() || application.isConfigurationMode()) {
             getWorkspace().setActiveProject(sessionProject);
         }
-        log.info(String.format(
-            "Project created: [ID=%s, Name=%s, Type=%s, Creator=%s]",
-            project.getId(), project.getName(), project.getType(), project.getCreator()
-        ));
         return sessionProject;
     }
 
+    @NotNull
     protected WebSessionProjectImpl createSessionProject(@NotNull RMProject project) throws DBException {
         return new WebSessionProjectImpl(this, project, getProjectPath(project));
     }
@@ -349,32 +380,24 @@ public class WebSession extends BaseWebSession
         return RMUtils.getProjectPath(project);
     }
 
+    @NotNull
     protected WebSessionProjectImpl createGlobalProject(RMProject project) {
         globalProject = new WebSessionGlobalProjectImpl(this, project);
         globalProject.refreshAccessibleConnectionIds();
         return globalProject;
     }
 
-    private void resetSessionCache() throws DBCException {
-        // Clear attributes
-        synchronized (attributes) {
-            for (Map.Entry<String, Function<Object, Object>> attrDisposer : attributeDisposers.entrySet()) {
-                Object attrValue = attributes.get(attrDisposer.getKey());
-                attrDisposer.getValue().apply(attrValue);
-            }
-            attributeDisposers.clear();
-            // Remove all non-persistent attributes
-            attributes.entrySet().removeIf(
-                entry -> !(entry.getValue() instanceof PersistentAttribute));
-        }
-    }
-
     private void resetNavigationModel() {
-        getWorkspace().getProjects().forEach(WebSessionProjectImpl::dispose);
+        navigatorModelLock.writeLock().lock();
+        try {
+            getWorkspace().getProjects().forEach(WebSessionProjectImpl::dispose);
 
-        if (this.navigatorModel != null) {
-            this.navigatorModel.dispose();
-            this.navigatorModel = null;
+            if (this.navigatorModel != null) {
+                this.navigatorModel.dispose();
+                this.navigatorModel = null;
+            }
+        } finally {
+            navigatorModelLock.writeLock().unlock();
         }
     }
 
@@ -417,15 +440,25 @@ public class WebSession extends BaseWebSession
 
     @Nullable
     public DBNModel getNavigatorModel() {
-        return navigatorModel;
+        navigatorModelLock.readLock().lock();
+        try {
+            return navigatorModel;
+        } finally {
+            navigatorModelLock.readLock().unlock();
+        }
     }
 
     @NotNull
     public DBNModel getNavigatorModelOrThrow() throws DBWebException {
-        if (navigatorModel != null) {
-            return navigatorModel;
+        navigatorModelLock.readLock().lock();
+        try {
+            if (navigatorModel != null) {
+                return navigatorModel;
+            }
+            throw new DBWebException("Navigator model is not found in session");
+        } finally {
+            navigatorModelLock.readLock().unlock();
         }
-        throw new DBWebException("Navigator model is not found in session");
     }
     /**
      * Returns and clears progress messages
@@ -439,8 +472,8 @@ public class WebSession extends BaseWebSession
         }
     }
 
-    public synchronized void updateInfo(boolean isOldHttpSessionUsed) {
-        log.debug("Update session lifetime " + getSessionId() + " for user " + getUserId());
+    public void updateInfo(boolean isOldHttpSessionUsed) {
+        log.trace("Update session lifetime " + getSessionId() + " for user " + getUserId());
         touchSession();
         if (isOldHttpSessionUsed) {
             try {
@@ -471,7 +504,6 @@ public class WebSession extends BaseWebSession
     public void close() {
         try {
             resetNavigationModel();
-            resetSessionCache();
         } catch (Throwable e) {
             log.error(e);
         }
@@ -488,7 +520,6 @@ public class WebSession extends BaseWebSession
     public void close(boolean clearTokens, boolean sendSessionExpiredEvent) {
         try {
             resetNavigationModel();
-            resetSessionCache();
         } catch (Throwable e) {
             log.error(e);
         }
@@ -503,6 +534,7 @@ public class WebSession extends BaseWebSession
         super.close(clearTokens, sendSessionExpiredEvent);
     }
 
+    @NotNull
     private List<WebAuthInfo> clearAuthTokens() throws DBException {
         ArrayList<WebAuthInfo> tokensCopy;
         synchronized (authTokens) {
@@ -559,6 +591,10 @@ public class WebSession extends BaseWebSession
         if (job instanceof CustomCancelableJob cancelableJob) {
             cancelableJob.cancelJob(this, taskInfo);
         }
+        CompletableFuture<?> future = getAttribute(getTaskConfirmationAttributeName(taskId));
+        if (future != null) {
+            future.cancel(false);
+        }
         if (job != null) {
             job.cancel();
         }
@@ -568,8 +604,7 @@ public class WebSession extends BaseWebSession
 
     public WebAsyncTaskInfo createAsyncTask(@NotNull String taskName) {
         int taskId = TASK_ID.incrementAndGet();
-        WebAsyncTaskInfo asyncTask = getAsyncTask(String.valueOf(taskId), taskName, true);
-        return asyncTask;
+        return getAsyncTask(String.valueOf(taskId), taskName, true);
     }
 
     public List<WebAsyncTaskInfo> findTasksByJob(@NotNull Class<? extends AbstractJob> jobClass) {
@@ -584,12 +619,18 @@ public class WebSession extends BaseWebSession
         }
     }
 
+    @NotNull
     public WebAsyncTaskInfo createAndRunAsyncTask(@NotNull String taskName, @NotNull WebAsyncTaskProcessor<?> runnable) {
         WebAsyncTaskInfo asyncTask = createAsyncTask(taskName);
+        return runAsyncTask(asyncTask, runnable);
+    }
 
-        AbstractJob job = new AbstractJob(taskName) {
+    @NotNull
+    public WebAsyncTaskInfo runAsyncTask(@NotNull WebAsyncTaskInfo asyncTask, @NotNull WebAsyncTaskProcessor<?> runnable) {
+        AbstractJob job = new AbstractCancelableJob(asyncTask.getName()) {
+            @NotNull
             @Override
-            protected IStatus run(DBRProgressMonitor monitor) {
+            protected IStatus run(@NotNull DBRProgressMonitor monitor) {
                 int curTaskCount = taskCount.incrementAndGet();
 
                 DBRProgressMonitor taskMonitor = new TaskProgressMonitor(monitor, WebSession.this, asyncTask);
@@ -625,11 +666,11 @@ public class WebSession extends BaseWebSession
         return asyncTask;
     }
 
-    public void addSessionError(Throwable exception) {
+    public void addSessionError(@NotNull Throwable exception) {
         addSessionMessage(new WebServerMessage(exception));
     }
 
-    public void addSessionMessage(WebServerMessage message) {
+    public void addSessionMessage(@NotNull WebServerMessage message) {
         synchronized (sessionMessages) {
             sessionMessages.add(message);
         }
@@ -640,14 +681,15 @@ public class WebSession extends BaseWebSession
             message.getMessage()));
     }
 
-    public void addInfoMessage(String message) {
+    public void addInfoMessage(@NotNull String message) {
         addSessionMessage(new WebServerMessage(MessageType.INFO, message));
     }
 
-    public void addWarningMessage(String message) {
+    public void addWarningMessage(@NotNull String message) {
         addSessionMessage(new WebServerMessage(MessageType.WARNING, message));
     }
 
+    @NotNull
     public List<WebServerMessage> readLog(Integer maxEntries, Boolean clearLog) {
         synchronized (sessionMessages) {
             List<WebServerMessage> messages = new ArrayList<>();
@@ -667,42 +709,6 @@ public class WebSession extends BaseWebSession
         }
     }
 
-    @Override
-    public <T> T getAttribute(String name) {
-        synchronized (attributes) {
-            Object value = attributes.get(name);
-            if (value instanceof PersistentAttribute persistentAttribute) {
-                value = persistentAttribute.value();
-            }
-            return (T) value;
-        }
-    }
-
-    public void setAttribute(String name, Object value, boolean persistent) {
-        synchronized (attributes) {
-            attributes.put(name, persistent ? new PersistentAttribute(value) : value);
-        }
-    }
-
-    public <T> T getAttribute(String name, Function<T, T> creator, Function<T, T> disposer) {
-        synchronized (attributes) {
-            Object value = attributes.get(name);
-            if (value instanceof PersistentAttribute persistentAttribute) {
-                value = persistentAttribute.value();
-            }
-            if (value == null) {
-                value = creator.apply(null);
-                if (value != null) {
-                    attributes.put(name, value);
-                    if (disposer != null) {
-                        attributeDisposers.put(name, (Function<Object, Object>) disposer);
-                    }
-                }
-            }
-            return (T) value;
-        }
-    }
-
     @Property
     public Map<String, Object> getActionParameters() {
         WebActionParameters action = WebActionParameters.fromSession(this, true);
@@ -720,7 +726,7 @@ public class WebSession extends BaseWebSession
                 }
                 return null;
             }
-            return authTokens.isEmpty() ? null : authTokens.get(0);
+            return authTokens.isEmpty() ? null : authTokens.getFirst();
         }
     }
 
@@ -731,7 +737,7 @@ public class WebSession extends BaseWebSession
         }
     }
 
-
+    @NotNull
     public List<WebAuthInfo> getAllAuthInfo() {
         synchronized (authTokens) {
             return new ArrayList<>(authTokens);
@@ -763,10 +769,7 @@ public class WebSession extends BaseWebSession
             if (oldAuthInfo != null) {
                 removeAuthInfo(oldAuthInfo);
             }
-            SMSession authSession = authInfo.getAuthSession();
-            if (authSession != null) {
-                getSessionContext().addSession(authSession);
-            }
+            getSessionContext().addSession(authInfo.getAuthSession());
         }
         synchronized (authTokens) {
             Collections.addAll(authTokens, tokens);
@@ -786,14 +789,14 @@ public class WebSession extends BaseWebSession
         });
     }
 
-    private void removeAuthInfo(WebAuthInfo oldAuthInfo) {
+    private void removeAuthInfo(@NotNull WebAuthInfo oldAuthInfo) {
         oldAuthInfo.closeAuth();
         synchronized (authTokens) {
             authTokens.remove(oldAuthInfo);
         }
     }
 
-    public List<WebAuthInfo> removeAuthInfo(String providerId, boolean needResetUserState) throws DBException {
+    public List<WebAuthInfo> removeAuthInfo(String providerId) throws DBException {
         List<WebAuthInfo> oldInfo;
         if (providerId == null) {
             oldInfo = clearAuthTokens();
@@ -806,16 +809,13 @@ public class WebSession extends BaseWebSession
                 oldInfo = List.of();
             }
         }
-        if (authTokens.isEmpty() && needResetUserState) {
+        if (authTokens.isEmpty()) {
             resetUserState();
         }
         return oldInfo;
     }
 
-    public List<WebAuthInfo> removeAuthInfo(String providerId) throws DBException {
-        return removeAuthInfo(providerId, true);
-    }
-
+    @Nullable
     public List<DBACredentialsProvider> getContextCredentialsProviders() {
         return getAdapters(DBACredentialsProvider.class);
     }
@@ -834,6 +834,7 @@ public class WebSession extends BaseWebSession
                 contextCredentialsProvider.provideAuthParameters(monitor, dataSourceContainer, configuration);
             }
             configuration.setRuntimeAttribute(RUNTIME_PARAM_AUTH_INFOS, getAllAuthInfo());
+            configuration.setRuntimeAttribute(RUNTIME_PARAM_CLIENT_ORIGIN, this.clientOrigin);
 
             WebSessionProjectImpl project = getProjectById(dataSourceContainer.getProject().getId());
             if (project != null) {
@@ -846,7 +847,7 @@ public class WebSession extends BaseWebSession
             // uncommented because we had the problem with non-native auth models
             // (for example, can't connect to DynamoDB if credentials are not saved)
             DBAAuthCredentials credentials = configuration.getAuthModel().loadCredentials(dataSourceContainer, configuration);
-            WebDataSourceUtils.updateCredentialsFromProperties(credentials, configuration.getAuthProperties());
+            WebDataSourceUtils.updateCredentialsFromProperties(this.progressMonitor, credentials, configuration.getAuthProperties());
 
             configuration.getAuthModel().provideCredentials(dataSourceContainer, configuration, credentials);
         } catch (DBException e) {
@@ -864,7 +865,7 @@ public class WebSession extends BaseWebSession
 
     // May be called to extract auth information from session
     @Override
-    public <T> T getAdapter(Class<T> adapter) {
+    public <T> T getAdapter(@NotNull Class<T> adapter) {
         synchronized (authTokens) {
             for (WebAuthInfo authInfo : authTokens) {
                 if (isAuthInfoInstanceOf(authInfo, adapter)) {
@@ -886,7 +887,7 @@ public class WebSession extends BaseWebSession
     }
 
     private <T> boolean isAuthInfoInstanceOf(WebAuthInfo authInfo, Class<T> adapter) {
-        if (authInfo != null && authInfo.getAuthSession() != null) {
+        if (authInfo != null) {
             return adapter.isInstance(authInfo.getAuthSession());
         }
         return false;
@@ -902,11 +903,11 @@ public class WebSession extends BaseWebSession
         return parameters;
     }
 
-    public synchronized void resetAuthToken() throws DBException {
+    public void resetAuthToken() throws DBException {
         this.userContext.reset();
     }
 
-    public synchronized boolean updateSMSession(SMAuthInfo smAuthInfo) throws DBException {
+    public boolean updateSMSession(SMAuthInfo smAuthInfo) throws DBException {
         boolean contextChanged = super.updateSMSession(smAuthInfo);
         if (contextChanged) {
             refreshUserData();
@@ -925,7 +926,7 @@ public class WebSession extends BaseWebSession
     }
 
     @Nullable
-    public WebSessionProjectImpl getProjectById(@Nullable String projectId) {
+    public WebSessionProjectImpl getProjectById(@NotNull String projectId) {
         return getWorkspace().getProjectById(projectId);
     }
 
@@ -934,6 +935,7 @@ public class WebSession extends BaseWebSession
      *
      * @throws DBWebException if project with provided id is not found.
      */
+    @NotNull
     public WebSessionProjectImpl getAccessibleProjectById(@Nullable String projectId) throws DBWebException {
         WebSessionProjectImpl project = null;
         if (projectId != null) {
@@ -945,6 +947,7 @@ public class WebSession extends BaseWebSession
         return project;
     }
 
+    @NotNull
     public List<WebSessionProjectImpl> getAccessibleProjects() {
         return getWorkspace().getProjects();
     }
@@ -954,26 +957,35 @@ public class WebSession extends BaseWebSession
      */
     public void addSessionProject(@NotNull WebSessionProjectImpl project) {
         getWorkspace().addProject(project);
-        if (navigatorModel != null) {
-            navigatorModel.getRoot().addProject(project, false);
+        navigatorModelLock.readLock().lock();
+        try {
+            if (navigatorModel != null) {
+                navigatorModel.getRoot().addProject(project, false);
+            }
+        } finally {
+            navigatorModelLock.readLock().unlock();
         }
     }
 
     /**
      * Removes project from session cache and navigator tree.
      */
-    public void deleteSessionProject(@Nullable WebSessionProjectImpl project) {
-        if (project != null) {
-            RMProject rmProject = project.getRMProject();
-            log.info(String.format(
-                "Project deleted: [ID=%s, Name=%s, Type=%s, Creator=%s]",
-                rmProject.getId(), rmProject.getName(), rmProject.getType(), rmProject.getCreator()
-            ));
-            project.dispose();
-        }
+    public void deleteSessionProject(@NotNull WebSessionProjectImpl project) {
+        RMProject rmProject = project.getRMProject();
+        log.info(String.format(
+            "Project deleted: [ID=%s, Name=%s, Type=%s, Creator=%s]",
+            rmProject.getId(), rmProject.getName(), rmProject.getType(), rmProject.getCreator()
+        ));
+        project.dispose();
+
         getWorkspace().removeProject(project);
-        if (navigatorModel != null) {
-            navigatorModel.getRoot().removeProject(project);
+        navigatorModelLock.readLock().lock();
+        try {
+            if (navigatorModel != null) {
+                navigatorModel.getRoot().removeProject(project);
+            }
+        } finally {
+            navigatorModelLock.readLock().unlock();
         }
     }
 
@@ -981,6 +993,10 @@ public class WebSession extends BaseWebSession
     public void addSessionProject(@NotNull String projectId) throws DBException {
         super.addSessionProject(projectId);
         var rmProject = getRmController().getProject(projectId, false, false);
+        if (rmProject == null) {
+            log.error("RM project '" + projectId + "' not found");
+            return;
+        }
         createWebProject(rmProject);
     }
 
@@ -995,7 +1011,7 @@ public class WebSession extends BaseWebSession
     }
 
     @Override
-    public void removeSessionProject(@Nullable String projectId) throws DBException {
+    public void removeSessionProject(@NotNull String projectId) throws DBException {
         super.removeSessionProject(projectId);
         var project = getProjectById(projectId);
         if (project == null) {
@@ -1004,15 +1020,6 @@ public class WebSession extends BaseWebSession
         deleteSessionProject(project);
     }
 
-    @NotNull
-    public DBFFileSystemManager getFileSystemManager(String projectId) throws DBException {
-        var project = getProjectById(projectId);
-        if (project == null) {
-            throw new DBException("Project not found: " + projectId);
-        }
-        return project.getFileSystemManager();
-    }
-
     @NotNull
     public WebSessionPreferenceStore getUserPreferenceStore() {
         return getUserContext().getPreferenceStore();
@@ -1023,14 +1030,59 @@ public class WebSession extends BaseWebSession
         return globalProject;
     }
 
+    public void handleTaskConfirmation(
+        @NotNull String taskId,
+        boolean confirmed,
+        boolean skipConfirmations
+    ) {
+        String attributeName = getTaskConfirmationAttributeName(taskId);
+        if (confirmed && skipConfirmations) {
+            setAttribute(WebSQLConstants.SKIP_TASK_CONFIRMATIONS_ATTR, Boolean.TRUE);
+        }
+
+        CompletableFuture<Boolean> confirmationFuture = getAttribute(attributeName);
+        if (confirmationFuture != null) {
+            confirmationFuture.complete(confirmed);
+            removeAttribute(attributeName);
+        } else {
+            log.error("Received unexpected confirmation event for taskId: " + taskId);
+        }
+    }
+
+    public void handleTaskConfirmationWithParameters(@NotNull String taskId, @NotNull Map<String, Object> parameters) {
+        String attributeName = getTaskConfirmationAttributeName(taskId);
+        CompletableFuture<Map<String, Object>> confirmationFuture = getAttribute(attributeName);
+        if (confirmationFuture != null) {
+            confirmationFuture.complete(parameters);
+            removeAttribute(attributeName);
+        } else {
+            log.error("Received unexpected confirmation event for taskId: " + taskId);
+        }
+    }
+
+    public void handleActionCancelledEvent(@NotNull String actionId) {
+        Object attributeValue = getAttribute(actionId);
+        if (!(attributeValue instanceof CompletableFuture<?> future)) {
+            log.info("Action to be cancelled not found, skipping: " + actionId);
+            return;
+        }
+        future.completeExceptionally(new DBWebException("Action cancelled by user: " + actionId));
+        removeAttribute(actionId);
+    }
+
+    @NotNull
+    private String getTaskConfirmationAttributeName(@NotNull String taskId) {
+        return WebSQLConstants.TASK_CONFIRMATION_ATTR_PREFIX + taskId;
+    }
+
     private class SessionProgressMonitor extends BaseProgressMonitor {
         @Override
-        public void beginTask(String name, int totalWork) {
+        public void beginTask(@NotNull String name, int totalWork) {
             addInfoMessage(name);
         }
 
         @Override
-        public void subTask(String name) {
+        public void subTask(@NotNull String name) {
             addInfoMessage(name);
         }
     }
@@ -1039,6 +1091,4 @@ public class WebSession extends BaseWebSession
         return true;
     }
 
-    private record PersistentAttribute(Object value) {
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java

@@ -74,7 +74,7 @@ public class WebSessionAuthProcessor {
             }
         } catch (Exception e) {
             if (resetUserStateOnError) {
-                webSession.resetUserState();
+                webSession.resetUserState(false);
             }
             throw new DBException(e.getMessage(), e);
         }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionEventsFilter.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,6 +68,13 @@ public class WebSessionEventsFilter {
         }
     }
 
+    public void migrateTo(@NotNull WebSessionEventsFilter target) {
+        synchronized (target.subscribedProjectIds) {
+            target.subscribedEventTopics.addAll(this.subscribedEventTopics);
+            target.subscribedProjectIds.addAll(this.subscribedProjectIds);
+        }
+    }
+
     public boolean isEventAllowed(WSEvent event) {
         if (event.isForceProcessed()) {
             return true;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionPreferenceStore.java

@@ -20,6 +20,7 @@ import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.impl.preferences.AbstractUserPreferenceStore;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
+import org.jkiss.utils.CommonUtils;
 
 import java.io.IOException;
 import java.util.Map;
@@ -85,4 +86,13 @@ public class WebSessionPreferenceStore extends AbstractUserPreferenceStore {
     public void save() throws IOException {
         throw new RuntimeException("Not implemented");
     }
+
+    public boolean getUserPreferenceBoolean(@NotNull String name, boolean fallbackValue) {
+        String value = CommonUtils.toString(userPreferences.get(name));
+        if (value.isEmpty()) {
+            return fallbackValue;
+        } else {
+            return toBoolean(value);
+        }
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionWorkspace.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,17 @@
 package io.cloudbeaver.model.session;
 
 import io.cloudbeaver.WebSessionProjectImpl;
+import io.cloudbeaver.utils.ServletAppUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBPAdaptable;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.app.DBPPlatform;
+import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
+import org.jkiss.dbeaver.model.fs.DBFFileSystemManager;
 import org.jkiss.dbeaver.model.impl.auth.SessionContextImpl;
 import org.jkiss.dbeaver.model.rm.RMUtils;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -36,11 +41,13 @@ import java.util.List;
  * Web workspace
  */
 public class WebSessionWorkspace implements DBPWorkspace {
+    private static final Log log = Log.getLog(WebSessionWorkspace.class);
 
     private final BaseWebSession session;
     private final SessionContextImpl workspaceAuthContext;
     private final List<WebSessionProjectImpl> accessibleProjects = new ArrayList<>();
     private WebSessionProjectImpl activeProject;
+    private DBFFileSystemManager fileSystemManager;
 
     public WebSessionWorkspace(BaseWebSession session) {
         this.session = session;
@@ -87,7 +94,9 @@ public class WebSessionWorkspace implements DBPWorkspace {
     @NotNull
     @Override
     public List<WebSessionProjectImpl> getProjects() {
-        return accessibleProjects;
+        synchronized (accessibleProjects) {
+            return new ArrayList<>(accessibleProjects);
+        }
     }
 
     @Nullable
@@ -99,26 +108,30 @@ public class WebSessionWorkspace implements DBPWorkspace {
     @Nullable
     @Override
     public WebSessionProjectImpl getProject(@NotNull String projectName) {
-        for (WebSessionProjectImpl project : accessibleProjects) {
-            if (project.getName().equals(projectName)) {
-                return project;
+        synchronized (accessibleProjects) {
+            for (WebSessionProjectImpl project : accessibleProjects) {
+                if (project.getName().equals(projectName)) {
+                    return project;
+                }
             }
         }
+        log.error("Project name '" + projectName + "' not found in session workspace");
         return null;
     }
 
     @Nullable
     @Override
     public WebSessionProjectImpl getProjectById(@NotNull String projectId) {
-        if (projectId == null) {
-            return activeProject;
-        }
-        for (WebSessionProjectImpl project : accessibleProjects) {
-            if (project.getId().equals(projectId)) {
-                return project;
+        synchronized (accessibleProjects) {
+            for (WebSessionProjectImpl project : accessibleProjects) {
+                if (project.getId().equals(projectId)) {
+                    return project;
+                }
             }
         }
-        return null;
+        log.error("Project ID '" + projectId + "' not found in session workspace");
+        // FIXME: return null here
+        return activeProject;
     }
 
     @NotNull
@@ -143,36 +156,74 @@ public class WebSessionWorkspace implements DBPWorkspace {
         return null;
     }
 
-    public void setActiveProject(WebSessionProjectImpl activeProject) {
+    @NotNull
+    @Override
+    public WebSessionProjectImpl createProject(@NotNull String name, @Nullable String description) throws DBException {
+        throw new DBException("Project creation is not supported in web session workspace");
+    }
+
+    @Override
+    public void deleteProject(@NotNull DBPProject project) throws DBException {
+        throw new DBException("Project removing is not supported in web session workspace");
+    }
+
+    @Override
+    public void renameProject(@NotNull DBPProject project, @NotNull String newName) throws DBException {
+        throw new DBException("Project renaming is not supported in web session workspace");
+    }
+
+    public void setActiveProject(@NotNull WebSessionProjectImpl activeProject) {
         this.activeProject = activeProject;
     }
 
-    void addProject(WebSessionProjectImpl project) {
-        accessibleProjects.add(project);
+    void addProject(@NotNull WebSessionProjectImpl project) {
+        synchronized (accessibleProjects) {
+            accessibleProjects.add(project);
+        }
     }
 
-    void removeProject(WebSessionProjectImpl project) {
-        accessibleProjects.remove(project);
+    void removeProject(@NotNull WebSessionProjectImpl project) {
+        synchronized (accessibleProjects) {
+            accessibleProjects.remove(project);
+        }
     }
 
     void clearProjects() {
-        if (!this.accessibleProjects.isEmpty()) {
-            for (WebSessionProjectImpl project : accessibleProjects) {
-                project.dispose();
+        synchronized (accessibleProjects) {
+            if (!this.accessibleProjects.isEmpty()) {
+                for (WebSessionProjectImpl project : accessibleProjects) {
+                    project.dispose();
+                }
+                this.activeProject = null;
+                this.accessibleProjects.clear();
             }
-            this.activeProject = null;
-            this.accessibleProjects.clear();
         }
     }
 
     @Override
     public boolean hasRealmPermission(@NotNull String permission) {
+        if (getWebSession() instanceof WebSession webSession) {
+            return webSession.getSessionPermissions().contains(permission);
+        }
         return false;
     }
 
     @Override
     public boolean supportsRealmFeature(@NotNull String feature) {
-        return false;
+        return ServletAppUtils.getServletApplication().getAppConfiguration().isFeatureEnabled(feature);
     }
 
+    @NotNull
+    @Override
+    public synchronized DBFFileSystemManager getFileSystemManager() {
+        if (fileSystemManager == null) {
+            synchronized (this) {
+                if (fileSystemManager == null) {
+                    fileSystemManager = new DBFFileSystemManager(session.getWorkspace());
+                }
+            }
+        }
+
+        return fileSystemManager;
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebUserContext.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,9 +53,9 @@ public class WebUserContext implements SMCredentialsProvider {
     private final ServletApplication application;
     private final DBPWorkspace workspace;
 
-    private WebUser user;
-    private Set<String> userPermissions;
-    private SMCredentials smCredentials = null;
+    private volatile WebUser user;
+    private volatile Set<String> userPermissions;
+    private volatile SMCredentials smCredentials = null;
     private String smSessionId;
     private String refreshToken;
 
@@ -63,11 +63,14 @@ public class WebUserContext implements SMCredentialsProvider {
     private SMAdminController adminSecurityController;
     private DBSSecretController secretController;
     private RMController rmController;
-    private DBFileController fileController;
-    private Set<String> accessibleProjectIds = new HashSet<>();
+    private final DBFileController fileController;
+    private final Set<String> accessibleProjectIds = new HashSet<>();
     private final WebSessionPreferenceStore preferenceStore;
 
-    public WebUserContext(ServletApplication application, DBPWorkspace workspace) throws DBException {
+    public WebUserContext(
+        @NotNull ServletApplication application,
+        @NotNull DBPWorkspace workspace
+    ) throws DBException {
         this.application = application;
         this.workspace = workspace;
         this.securityController = application.createSecurityController(this);
@@ -84,7 +87,7 @@ public class WebUserContext implements SMCredentialsProvider {
      * @return - true if context changed
      * @throws DBException - if user already authorized and new token come from another user
      */
-    public synchronized boolean refresh(SMAuthInfo smAuthInfo) throws DBException {
+    public boolean refresh(@NotNull SMAuthInfo smAuthInfo) throws DBException {
         if (smAuthInfo.getAuthPermissions() == null && !isAuthorizedInSecurityManager()) {
             throw new DBCException("Required information about session permissions is missing");
         }
@@ -172,49 +175,56 @@ public class WebUserContext implements SMCredentialsProvider {
     }
 
     @NotNull
-    public synchronized SMController getSecurityController() {
+    public SMController getSecurityController() {
         return securityController;
     }
 
     @Nullable
     @Override
-    public synchronized SMCredentials getActiveUserCredentials() {
+    public SMCredentials getActiveUserCredentials() {
         return smCredentials;
     }
 
-    public synchronized boolean isAuthorizedInSecurityManager() {
+    public boolean isAuthorizedInSecurityManager() {
         return smCredentials != null;
     }
 
-    public synchronized boolean isNonAnonymousUserAuthorizedInSM() {
+    public boolean isNonAnonymousUserAuthorizedInSM() {
         return isAuthorizedInSecurityManager() && getUser() != null;
     }
 
+    public boolean isAnonymousUserAuthorizedInSM() {
+        return isAuthorizedInSecurityManager() && getUser() == null;
+    }
+
     @Nullable
-    public synchronized WebUser getUser() {
+    public WebUser getUser() {
         return user;
     }
 
-    public synchronized String getUserId() {
+    @Nullable
+    public String getUserId() {
         return user == null ? null : user.getUserId();
     }
 
-    protected synchronized void setUser(@Nullable WebUser user) {
+    protected void setUser(@Nullable WebUser user) {
         this.user = user;
     }
 
-    public synchronized SMAdminController getAdminSecurityController() {
+    @NotNull
+    public SMAdminController getAdminSecurityController() {
         return adminSecurityController;
     }
 
-    public synchronized Set<String> getUserPermissions() {
+    @Nullable
+    public Set<String> getUserPermissions() {
         return userPermissions;
     }
 
     /**
      * reread the current user's permissions
      */
-    public synchronized void refreshPermissions() throws DBException {
+    public void refreshPermissions() throws DBException {
         if (isAuthorizedInSecurityManager()) {
             log.debug("refresh permissions " + getUserId() + " " + getSmSessionId());
             setUserPermissions(securityController.getTokenPermissions().getPermissions());
@@ -227,6 +237,7 @@ public class WebUserContext implements SMCredentialsProvider {
         this.userPermissions = permissions;
     }
 
+    @NotNull
     public DBSSecretController getSecretController() throws DBException {
         if (this.securityController == null) {
             this.secretController = application.getSecretController(this, workspace.getAuthContext());
@@ -234,18 +245,22 @@ public class WebUserContext implements SMCredentialsProvider {
         return secretController;
     }
 
-    public synchronized String getSmSessionId() {
+    @Nullable
+    public String getSmSessionId() {
         return smSessionId;
     }
 
+    @Nullable
     private Set<String> getDefaultPermissions() {
         return application.isAnonymousAccessEnabled() ? null : Set.of();
     }
 
+    @NotNull
     public RMController getRmController() {
         return rmController;
     }
 
+    @NotNull
     public DBFileController getFileController() {
         return fileController;
     }
@@ -259,6 +274,7 @@ public class WebUserContext implements SMCredentialsProvider {
         this.refreshToken = refreshToken;
     }
 
+    @NotNull
     public WebSessionPreferenceStore getPreferenceStore() {
         return preferenceStore;
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/monitor/TaskProgressMonitor.java

@@ -40,14 +40,14 @@ public class TaskProgressMonitor extends ProxyProgressMonitor {
     }
 
     @Override
-    public void beginTask(String name, int totalWork) {
+    public void beginTask(@NotNull String name, int totalWork) {
         super.beginTask(name, totalWork);
         asyncTask.setStatus(name);
         WebEventUtils.sendAsyncTaskEvent(webSession, asyncTask);
     }
 
     @Override
-    public void subTask(String name) {
+    public void subTask(@NotNull String name) {
         super.subTask(name);
         asyncTask.setStatus(name);
         WebEventUtils.sendAsyncTaskEvent(webSession, asyncTask);

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/user/WebUser.java

@@ -114,4 +114,9 @@ public class WebUser {
     public String getDisableReason() {
         return user.getDisableReason();
     }
+
+    @Nullable
+    public Instant getLastLoginTime() {
+        return user.getLastLoginTime();
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebAuthProviderDescriptor.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,8 @@ import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.security.SMAuthCredentialsProfile;
 import org.jkiss.dbeaver.model.security.SMAuthProviderDescriptor;
 import org.jkiss.dbeaver.model.security.SMSubjectType;
+import org.jkiss.dbeaver.utils.GeneralUtils;
+import org.jkiss.dbeaver.utils.SystemVariablesResolver;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 
@@ -57,6 +59,7 @@ public class WebAuthProviderDescriptor extends AbstractDescriptor {
     private final boolean isPrivate;
     private final boolean isAuthHidden;
     private final boolean isCaseInsensitive;
+    private final boolean sameTabRedirectOnLogout;
     private final boolean serviceProvider;
     private final String[] requiredFeatures;
     private final boolean isRequired;
@@ -73,6 +76,7 @@ public class WebAuthProviderDescriptor extends AbstractDescriptor {
         this.isRequired = CommonUtils.toBoolean(cfg.getAttribute(WebRegistryConstant.ATTR_REQUIRED));
         this.isAuthHidden = CommonUtils.toBoolean(cfg.getAttribute(WebRegistryConstant.ATTR_AUTH_HIDDEN));
         this.isCaseInsensitive = CommonUtils.toBoolean(cfg.getAttribute(WebRegistryConstant.ATTR_CASE_INSENSITIVE));
+        this.sameTabRedirectOnLogout = CommonUtils.toBoolean(cfg.getAttribute(WebRegistryConstant.ATTR_SAME_TAB_LOGOUT_REDIRECT));
         this.serviceProvider = CommonUtils.toBoolean(cfg.getAttribute(WebRegistryConstant.ATTR_SERVICE_PROVIDER));
 
         for (IConfigurationElement cfgElement : cfg.getChildren(WebRegistryConstant.TAG_CONFIGURATION)) {
@@ -110,7 +114,9 @@ public class WebAuthProviderDescriptor extends AbstractDescriptor {
     }
 
     public String getDescription() {
-        return cfg.getAttribute(WebRegistryConstant.ATTR_DESCRIPTION);
+        return GeneralUtils.replaceVariables(
+            cfg.getAttribute(WebRegistryConstant.ATTR_DESCRIPTION), SystemVariablesResolver.INSTANCE
+        );
     }
 
     public DBPImage getIcon() {
@@ -125,6 +131,10 @@ public class WebAuthProviderDescriptor extends AbstractDescriptor {
         return trusted;
     }
 
+    public boolean isSameTabRedirectOnLogout() {
+        return sameTabRedirectOnLogout;
+    }
+
     public boolean isPrivate() {
         return isPrivate;
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebAuthProviderProperty.java

@@ -17,12 +17,18 @@
 package io.cloudbeaver.registry;
 
 import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.DBPConditionalProperty;
 import org.jkiss.dbeaver.model.impl.LocalizedPropertyDescriptor;
+import org.jkiss.dbeaver.utils.RuntimeUtils;
+import org.osgi.framework.Bundle;
 
 public class WebAuthProviderProperty extends LocalizedPropertyDescriptor implements DBPConditionalProperty {
+
+    private static final String WEB_AUTH_PROPERTY_PREFIX = "prop.auth.model.";
+
     private final String[] requiredFeatures;
     @Nullable
     private final String type;
@@ -30,6 +36,7 @@ public class WebAuthProviderProperty extends LocalizedPropertyDescriptor impleme
     private final String authProviderId;
     private final String hideExpr;
     private final String readOnlyExpr;
+    private final Bundle bundle;
 
     public WebAuthProviderProperty(String category, IConfigurationElement config, String authProviderId) {
         super(category, config);
@@ -39,6 +46,7 @@ public class WebAuthProviderProperty extends LocalizedPropertyDescriptor impleme
         this.type = config.getAttribute("type");
         this.hideExpr = config.getAttribute("hideExpr");
         this.readOnlyExpr = config.getAttribute("readOnlyExpr");
+        this.bundle = extractBundle(config);
     }
 
     @NotNull
@@ -63,12 +71,34 @@ public class WebAuthProviderProperty extends LocalizedPropertyDescriptor impleme
         return readOnlyExpr;
     }
 
+    @NotNull
     @Override
-    public String getPropertyId() {
+    public String getLocalizedName(@NotNull String locale) {
+        return RuntimeUtils.getBundleLocalization(bundle, locale).getString(getPropertyId());
+    }
+
+    @Nullable
+    @Override
+    public String getLocalizedDescription(@NotNull String locale) {
+        return RuntimeUtils.getBundleLocalization(bundle, locale).getString(getPropertyId() + "." + ATTR_DESCRIPTION);
+    }
+
+    private String getPropertyId() {
         if (authProviderId != null) {
-            return "prop.auth.model." + authProviderId + "." + this.getId();
+            return WEB_AUTH_PROPERTY_PREFIX + authProviderId + "." + this.getId();
         } else {
-            return "prop.auth.model." + this.getId();
+            return WEB_AUTH_PROPERTY_PREFIX + this.getId();
         }
     }
+
+    @NotNull
+    private Bundle extractBundle(@NotNull IConfigurationElement config) {
+        final Bundle bundle;
+        String bundleName = config.getContributor().getName();
+        bundle = Platform.getBundle(bundleName);
+        if (bundle == null) {
+            throw new IllegalStateException("Bundle '" + bundleName + "' not found");
+        }
+        return bundle;
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebFeatureDescriptor.java

@@ -38,8 +38,7 @@ public class WebFeatureDescriptor extends AbstractContextDescriptor implements D
     private final DBPImage icon;
     private final boolean enabledByDefault;
 
-    public WebFeatureDescriptor(IConfigurationElement config)
-    {
+    public WebFeatureDescriptor(@NotNull IConfigurationElement config) {
         super(config);
         this.id = config.getAttribute("id");
         this.label = config.getAttribute("label");
@@ -77,4 +76,7 @@ public class WebFeatureDescriptor extends AbstractContextDescriptor implements D
         return enabledByDefault;
     }
 
+    public boolean isApplicable() {
+        return true;
+    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebFeatureRegistry.java

@@ -20,10 +20,12 @@ import io.cloudbeaver.DBWFeatureSet;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
+import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.Log;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class WebFeatureRegistry {
 
@@ -33,7 +35,7 @@ public class WebFeatureRegistry {
 
     private static WebFeatureRegistry instance = null;
 
-    public synchronized static WebFeatureRegistry getInstance() {
+    public static synchronized WebFeatureRegistry getInstance() {
         if (instance == null) {
             instance = new WebFeatureRegistry();
             instance.loadExtensions(Platform.getExtensionRegistry());
@@ -41,23 +43,28 @@ public class WebFeatureRegistry {
         return instance;
     }
 
-    private final List<DBWFeatureSet> webFeatures = new ArrayList<>();
+    private final List<WebFeatureDescriptor> webFeatures = new ArrayList<>();
 
-    private WebFeatureRegistry() {
-    }
 
-    private void loadExtensions(IExtensionRegistry registry) {
+    protected void loadExtensions(@NotNull IExtensionRegistry registry) {
         IConfigurationElement[] extConfigs = registry.getConfigurationElementsFor(WebFeatureDescriptor.EXTENSION_ID);
         for (IConfigurationElement ext : extConfigs) {
             if (TAG_FEATURE.equals(ext.getName())) {
-                this.webFeatures.add(
-                    new WebFeatureDescriptor(ext));
+                this.webFeatures.add(createFeatureDescriptor(ext));
             }
         }
     }
 
+    @NotNull
+    protected WebFeatureDescriptor createFeatureDescriptor(@NotNull IConfigurationElement ext) {
+        return new WebFeatureDescriptor(ext);
+    }
+
+    @NotNull
     public List<DBWFeatureSet> getWebFeatures() {
-        return webFeatures;
+        return webFeatures.stream()
+            .filter(WebFeatureDescriptor::isApplicable)
+            .collect(Collectors.toList());
     }
 
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebRegistryConstant.java

@@ -29,6 +29,7 @@ public class WebRegistryConstant {
     public static final String ATTR_REQUIRED = "required";
     public static final String ATTR_AUTH_HIDDEN = "authHidden";
     public static final String ATTR_CASE_INSENSITIVE = "caseInsensitive";
+    public static final String ATTR_SAME_TAB_LOGOUT_REDIRECT = "sameTabRedirectOnLogout";
     public static final String ATTR_REQUIRED_FEATURES = "requiredFeatures";
     public static final String ATTR_CATEGORIES = "categories";
     public static final String ATTR_SERVICE_PROVIDER = "serviceProvider";

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/BaseServletPlatform.java

@@ -41,7 +41,7 @@ public abstract class BaseServletPlatform extends BasePlatformImpl {
         if (tempFolder == null) {
             synchronized (this) {
                 if (tempFolder == null) {
-                    initTempFolder(monitor);
+                    initTempFolder();
                 }
             }
         }
@@ -56,11 +56,11 @@ public abstract class BaseServletPlatform extends BasePlatformImpl {
         return folder;
     }
 
+    @NotNull
     public abstract ServletApplication getApplication();
 
-    private void initTempFolder(@NotNull DBRProgressMonitor monitor) {
+    private void initTempFolder() {
         // Make temp folder
-        monitor.subTask("Create temp folder");
         String sysTempFolder = System.getProperty(StandardConstants.ENV_TMP_DIR);
         if (CommonUtils.isNotEmpty(sysTempFolder)) {
             tempFolder = Path.of(sysTempFolder).resolve(BASE_TEMP_DIR).resolve(DBWConstants.WORK_DATA_FOLDER_NAME);
@@ -68,9 +68,11 @@ public abstract class BaseServletPlatform extends BasePlatformImpl {
             //we do not use workspace because it can be in external file system
             tempFolder = getApplication().getHomeDirectory().resolve(DBWConstants.WORK_DATA_FOLDER_NAME);
         }
+        log.debug("Temp folder: " + tempFolder);
     }
 
     public synchronized void dispose() {
+        super.dispose();
         // Remove temp folder
         if (tempFolder != null) {