dbeaver/pro#7990 qmdb csv export (#4306 )

* dbeaver/pro#7990 refactor: make onRemove prop optional in Tag component * dbeaver/pro#7990 feat: add postForBlob helper function for using with export qm history servlets * dbeaver/pro#7990 feat: replace postForBlob with submitForm for form submissions Co-authored-by: Copilot <copilot@github.com> * dbeaver/pro#7990 tests: add tests for submitForm and objectToFormFields functions --------- Co-authored-by: Copilot <copilot@github.com> Co-authored-by: Evgenia <139753579+EvgeniaBzzz@users.noreply.github.com> Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
9089 core optimize command line execution (#4317 )
2026-10-16 14:50:15 +08:00 · 2026-05-12 17:45:59 +02:00 · 2026-05-12 15:30:41 +02:00 · 2026-05-12 13:28:50 +02:00 · 2026-05-11 16:15:39 +02:00 · 2026-05-11 16:14:13 +02:00
2226 changed files with 51960 additions and 25098 deletions
@@ -15,11 +15,11 @@
    "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",
    "esbenp.prettier-vscode",
    "devnaumov.licensify"
  ]
-}
+}
@@ -48,7 +48,7 @@
        "-Declipse.pde.launch=true",
        "-XstartOnFirstThread",
        "-Dfile.encoding=UTF-8",
-        "--add-modules=ALL-SYSTEM",
+        "--add-modules=ALL-DEFAULT",
        "--add-opens=java.base/java.io=ALL-UNNAMED",
        "--add-opens=java.base/java.lang=ALL-UNNAMED",
        "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
@@ -92,10 +92,10 @@
      "label": "Run Backend CE",
      "type": "shell",
      "windows": {
-        "command": "./run-server.bat"
+        "command": "./run-cloudbeaver-server.bat"
      },
      "osx": {
-        "command": "./run-server.sh"
+        "command": "./run-cloudbeaver-server.sh"
      },
      "options": {
        "cwd": "${workspaceFolder}/deploy/cloudbeaver"
@@ -136,6 +136,15 @@
        "cwd": "${workspaceFolder}/webapp/common-react/@dbeaver/ui-kit"
      },
      "args": ["docs"]
+    },
+    {
+      "label": "Run Storybook",
+      "type": "shell",
+      "command": "yarn",
+      "options": {
+        "cwd": "${workspaceFolder}/webapp/packages/storybook"
+      },
+      "args": ["storybook"]
    }
  ],
  "inputs": [
@@ -1,6 +1,6 @@
 {
  "name": "vscode-java-configs",
-  "packageManager": "yarn@4.9.2",
+  "packageManager": "yarn@4.14.1",
  "devDependencies": {
    "typescript": "^5.8.3"
  }
@@ -1,4 +1,4 @@
-<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

@@ -25,37 +25,150 @@ You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io

 ## Changelog

-### 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.
- 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.
- 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.
+### 26.0.4 2026-05-04

-## Contribution
-As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 
+- Data Editor:
+    - Added the ability to copy-paste multiple cells at once. Pasted values will be distributed across separate cells, not put in a single cell.
+    - Data Editor started to keep the state of column configurations, such as filters, sorting, and ordering, after the reconnect, page refresh, and re-login.
+- 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 the ability to view and edit scripts without connecting to the database.
+    - Added more settings to the Generated SQL window, including the ability to select fully qualified names for query or use compact SQL formatting.
+    - Added the ability to open in the SQL Editor generated queries right from the Generate SQL window.
+- Accessibility:
+    - Fixed contrast for elements across different application parts in the light and dark themes to meet WCAG requirements.
+- General:
+    - Removed the "Folders" setting from the available settings for the Navigator Tree.
+- Databases:
+    - DuckDB: Fixed map rendering for GEOMETRY types with CRS parameters.
+    - 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.
+    - SQL Server: Fixed DDL generation for external tables.
+- Security:
+    - Updated session handling to prompt the application to generate a new session identifier for each login.
+    - Fixed the high vulnerability (CVE-2026-3505) in the bcpg-jdk18on library. The library was updated to version 1.84.0.
+
+### 26.0.3 2026-04-20
+
+- Data Editor:
+    - Added key column mark for tables with unique keys in the data grid.
+    - Added the ability to paste a copied cell into multiple cells and to set multiple cells to NULL.
+    - 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.
+- Accessibility:
+    - Added the Skip to content option for quick keyboard access to the Navigator Tree, editors, and shortcuts to improve application accessibility.
+- General:
+    - SQL Editor: Fixed keyword autocompletion for partially typed keywords. There are no extra letters for them after completion.
+    - 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)
+    - Fixed custom driver properties display for the connection page.
+    - Fixed data export in SQL format for values containing single quotes.
+- Databases:
+    - ClickHouse: Fixed the display of Array(JSON) types in the data grid.
+    - Added support for the "prompt=false" connection property for DB2 for IBM i to turn off interactive prompts and prevent related errors.
+- Security:
+    - 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.
+ 
+### 26.0.2 2026-04-06
+
+- UI improvements:
+    - Marked icons for non-saved (temporary) scripts with the hourglass symbol to add visual distinction from the saved ones.
+    - Added the tooltip about quoting rules for the Bind variables parameters dialog.
+    - Improved keyboard navigation for context menu and buttons for Data Editor, SQL Editor, and Navigator tree.
+- Authentication:
+    - Fixed the bug with the authentication form. Now the same password is required for the password change operation.
+    - Fixed the display of authentication fields for SQL Server with Active Directory - MSI. The unnecessary Password field was removed.
+- Databases and drivers:
+    - DuckDB: Fixed geometry type display for database versions > 1.5. (thanks @EastLord).
+    - H2 database:
+        - Added new embedded driver version 2.4.2.
+        - Updated server driver to the version 2.4.2.
+- Security:
+    - 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-2026-33228) in the flatted library. The library was updated to version 3.4.2.
+
+### 26.0.1 2026-03-23
+
+  - Data Editor:
+    - 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.
+    - Added support for adding, duplicating, deleting, or setting values to NULL in multiple highlighted rows via the Data Editor context menu.
+    - SQL query generation in the Data Editor is now available for columns containing large object data.
+    - Improved column drag-and-drop behavior in the Data Editor. Users could drag columns from any area within the header and drop them onto any part of the target column or table body.
+  - SQL Editor:
+    - Added fuzzy search to SQL Editor auto-completion for object names. The feature allowed users to find tables and containers even with typos or incorrect letter ordering by matching strings that start with, contain, or resemble the input.
+    - Fixed data editing for SQL scripts with variables.
+  - General:
+    - Added a close button to the right tab when it is the only open tab (ex. Scripts). Users no longer needed to use the main menu to close a single tab.
+    - Replaced the generic "Something went wrong" message with a specific network error notification when the application cannot connect to the server.
+    - Null or empty values can now be assigned to the Driver properties for all drivers.
+    - Fixed an issue where re-selecting an existing SSH key file during connection edits caused problems.
+    - Fixed the ability to switch tabs in the Data editor using the keyboard.
+    - Fixed error notification spelling. Thanks to @Malcolm-B-Breaks.
+  - ClickHouse:
+    - Updated driver version to 0.9.7.
+    - Fixed IP address display in the Data Editor by removing the leading slash.
+  - PostgreSQL: Fixed an error when connecting via URL if the database name contains a hyphen.
+  - Security:
+    - 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.
+
+### 26.0.0 2026-03-02
+
+### Changes since 25.3.0:
+
+  - Security:
+    - Enforced complete logout and screen data clearance upon session expiration;
+    - Fixed the high vulnerability (CVE-2026-25639) in the axios library. The library was updated to version 1.13.5.
+  - Administration:
+    - Added support for mapping users to CloudBeaver teams based on LDAP memberOf group membership;
+    - Change the User list settings in the Administration part to show both active and inactive users by default.
+  - SQL Editor:
+    - Added support for parameters and variables in queries. This feature allows queries to be reused by changing parameters at execution time. Enabled by default and configurable in personal preferences;
+    - Added SQL preview to the Bind parameters/variables dialog to review queries with changed values on the fly;
+    - Enabled Tab key for autocompletion in the SQL Editor alongside the Enter key;
+    - Added a new setting in the SQL Editor to highlight spaces, tabs, and other whitespace characters to help users read, debug, and maintain their scripts. It is turned off by default and can be configured in personal preferences;
+    - Dangerous query confirmation is now shown for all DROP statements, not just for tables.
+  - Data Editor:
+    - Added ability to automatically generate INSERT, SELECT, DELETE, and UPDATE statements for the selected values;
+    - Added undo and redo functionality for cell edits, row operations, and other data modifications. Retains the last 50 actions across the Data Editor, result sets, and related panels;
+    - Added "Use local formatting" setting. Users can choose how to display numbers and dates: using the OS locale, a custom locale, or keeping values unformatted. This formatting applies only to displayed values. Data in the database remains unchanged;
+    - Added column pinning to keep key columns (e.g., IDs, names) visible while horizontal scrolling through wide tables;
+    - Added status indicator icon in the top-left corner with tooltips explaining table editability. Indicates presence of primary keys, read-only connection settings, or read-only columns;
+    - Added shortcut Ctrl/Cmd + . to cancel operations in Data Editor;
+    - Fixed application freeze in canceling fetch size requests for large tables.
+  - Navigator tree:
+    - Added the ability to duplicate connection configuration in the project navigation tree. The "Clone connection" feature is available in the context menu;
+    - Added the ability for users to configure the Simple or Advanced view in the Navigation tree for all connections or for each connection separately;
+    - Added the ability to show table objects, such as columns or keys, in the Navigation tree. The setting is disabled by default and can be turned on in the Navigator settings panel;
+    - Added the ability to rename connections via context menu in the Navigation Tree;
+    - Added Connection Info tab to display basic information about the current connection for all users.
+  - General:
+    - Added support for long polling as a fallback when WebSockets are unavailable or blocked. Ensures reliable communication for metadata updates and SQL execution;
+    - Extended browser support to versions up to three years old;
+    - Redesigned the connection configuration page. Reorganized form fields and sections to provide more input space and reduce visual clutter;
+    - Expanded pointer target areas for icons in the Navigator, editors, and tabs according to the accessibility standards;
+    - Fixed a keyboard navigation issue for panels to keep the focus inside;
+    - Renamed "Database Native" authentication type to "Username/password" in the connection dialog;
+    - Fixed issue where the missing pg_dump utility caused errors during initialization or deployment updates when PostgreSQL was selected as the inner database.
+  - Databases:
+  - ClickHouse:
+    - Updated driver to version 0.9.5
+    - Added spatial data support
+    - Fixed an issue with displaying arrays of UUID, IPv4/IPv6, and Map types
+    - Fixed JSON data type reading
+    - Resolved an issue with CTE expressions
+  - DuckDB:
+    - Updated driver to version 1.4.4.0;
+    - Added support for the dollar-quoted string syntax for the SQL Editor
+  - Oracle: Added a new "Set Username to OS_USER" option in the Misc section of Oracle connection settings. Automatically uses the current database username as the operating system user identifier in session metadata when enabled;
+  - PostgreSQL: Added DDL display support for PostgreSQL policies.

 [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.
@@ -28,4 +28,4 @@ echo "Copy static content"

 cp -rp ../webapp/packages/product-default/lib/* cloudbeaver/web

-echo "Cloudbeaver is ready. Run run-server.sh in cloudbeaver folder to start the server."
+echo "Cloudbeaver is ready. Run run-cloudbeaver-server.sh in cloudbeaver folder to start the server."
@@ -72,6 +72,6 @@ echo "Copy static content"

 xcopy /E /Q ..\webapp\packages\product-default\lib cloudbeaver\web >NUL

-echo "Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server."
+echo "Cloudbeaver is ready. Run run-cloudbeaver-server.bat in cloudbeaver folder to start the server."

 pause
@@ -16,6 +16,6 @@ EXPOSE 8978
 RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \;
 WORKDIR /opt/cloudbeaver/

-RUN chmod +x "run-server.sh" "/opt/cloudbeaver/launch-product.sh"
+RUN chmod +x "run-cloudbeaver-server.sh" "/opt/cloudbeaver/launch-product.sh"

 ENTRYPOINT ["./launch-product.sh"]
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -Eeo pipefail
+if [[ $# -eq 0 ]] ;
+  then
+    set -- "$@" -help
+fi
+set -- "$@" -cli-mode
+
+source run-cloudbeaver-server.sh "$@"
@@ -12,8 +12,8 @@ if [ "$(id -u)" -eq 0 ]; then
    TARGET_GID=${TARGET_GID:-$DBEAVER_GID}

    chown -R $DBEAVER_UID:$DBEAVER_GID $PWD/workspace
-    # Execute run-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-server.sh"
+    # 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 $*"
 else
-    exec ./run-server.sh
-fi
+    exec ./run-cloudbeaver-server.sh "$@"
+fi
@@ -17,7 +17,7 @@ If Not Defined JAVA_OPTS (

 java %JAVA_OPTS% ^
    -Dfile.encoding=UTF-8 ^
-    --add-modules=ALL-SYSTEM ^
+    --add-modules=ALL-DEFAULT ^
    --add-opens=java.base/java.io=ALL-UNNAMED ^
    --add-opens=java.base/java.lang=ALL-UNNAMED ^
    --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ^
@@ -11,7 +11,7 @@ echo "Starting Cloudbeaver Server"

 exec java ${JAVA_OPTS} \
  -Dfile.encoding=UTF-8 \
-  --add-modules=ALL-SYSTEM \
+  --add-modules=ALL-DEFAULT \
  --add-opens=java.base/java.io=ALL-UNNAMED \
  --add-opens=java.base/java.lang=ALL-UNNAMED \
  --add-opens=java.base/java.lang.reflect=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 \
-  ${CLI_OPTS} \
  -nl en \
  -registryMultiLanguage
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -Eeo pipefail
-CLI_OPTS="$@"
-if [[ $# -eq 0 ]] ;
-  then
-    CLI_OPTS='-help'
-fi
-source run-server.sh
@@ -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.10.qualifier
+Bundle-Release-Date: 20260518
+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
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+    META-INF/,\
+    plugin.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<plugin>
+
+</plugin>
@@ -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.10-SNAPSHOT</version>
+    <packaging>eclipse-plugin</packaging>
+
+</project>
@@ -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;
+    }
+}
@@ -16,31 +16,39 @@
 */
 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;
-import org.jkiss.dbeaver.model.cli.CliProcessResult;
+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);
+    public CLIProcessResult handleCommandLine(@NotNull String[] 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());
+            return new CLIProcessResult(CLIProcessResult.PostAction.ERROR, "Error executing command: " + e.getMessage());
        }
    }
 }
@@ -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;
+}
@@ -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);
+    }
+}
@@ -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.85.qualifier
-Bundle-Release-Date: 20250922
+Bundle-Version: 1.0.101.qualifier
+Bundle-Release-Date: 20260518
 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,
@@ -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>
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.model</artifactId>
-    <version>1.0.85-SNAPSHOT</version>
+    <version>1.0.101-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -17,18 +17,14 @@
 package io.cloudbeaver;

 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+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.RMController;
-import org.jkiss.dbeaver.model.rm.RMControllerProvider;
-import org.jkiss.dbeaver.model.rm.RMProject;
-import org.jkiss.dbeaver.model.rm.RMProjectType;
-import org.jkiss.utils.CommonUtils;
-import org.jkiss.utils.Pair;
+import org.jkiss.dbeaver.model.rm.*;

 import java.nio.file.Path;
-import java.util.Collection;

 public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerProvider {

@@ -81,6 +77,12 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
        return project.getId();
    }

+    @NotNull
+    @Override
+    public String getDisplayName() {
+        return getName();
+    }
+
    @NotNull
    @Override
    public Path getAbsolutePath() {
@@ -102,52 +104,25 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
        return false;
    }

-    /**
-     * 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 Path getMetadataFilePath() {
-        return getMetadataPath().resolve(METADATA_STORAGE_FILE);
-    }
-
    @Override
    public boolean isPrivateProject() {
        return RMProjectType.USER.equals(getRMProject().getType());
    }
+
+    @Override
+    public void updateProject(@Nullable String newName, @Nullable String description) throws DBException {
+        RMProject rmProject = getResourceController().updateProject(this.getId(), new RMProjectInfo(newName, description));
+        updateProjectInfo(rmProject.getName(), rmProject.getDescription());
+    }
+
+    public void updateProjectInfo(@Nullable String newName, @Nullable String description) {
+        this.project.setName(newName);
+        this.project.setDescription(description);
+        RMEventManager.fireEvent(
+            new RMEvent(
+                RMEvent.Action.PROJECT_UPDATE,
+                project
+            )
+        );
+    }
 }
@@ -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";
@@ -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) {
@@ -0,0 +1,119 @@
+/*
+ * 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 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;
+import org.jkiss.dbeaver.Log;
+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 WebSession webSession, @NotNull DBPDataSourceRegistry registry, T configInput) {
+        this.webSession = webSession;
+        this.registry = registry;
+        this.input = configInput;
+    }
+
+    public C createDataSourceContainer() throws DBWebException {
+        String driverId = input.getDriverId();
+        if (CommonUtils.isEmpty(driverId)) {
+            throw new DBWebException("Driver must be specified");
+        }
+        DBPDriver driver = WebDataSourceUtils.getDriverById(driverId);
+
+        C newDataSource = createDataSourceContainerFromInput(driver);
+
+        if (ServletAppUtils.getServletApplication().getAppConfiguration() instanceof WebAppConfiguration webAppConfiguration) {
+            newDataSource.setNavigatorSettings(webAppConfiguration.getDefaultNavigatorSettings());
+        }
+
+        WebDataSourceUtils.saveAuthProperties(
+            webSession.getProgressMonitor(),
+            newDataSource,
+            newDataSource.getConnectionConfiguration(),
+            input.getCredentials(),
+            input.isSaveCredentials(),
+            input.isSharedCredentials()
+        );
+        return newDataSource;
+    }
+
+    public void updateDataSource(@NotNull C dataSource) throws DBWebException {
+        dataSource.setId(dataSource.getId());
+        if (!CommonUtils.isEmpty(input.getName())) {
+            dataSource.setName(input.getName());
+        }
+
+        if (input.getDescription() != null) {
+            dataSource.setDescription(input.getDescription());
+        }
+
+        dataSource.setFolder(input.getFolder() != null ? registry.getFolder(input.getFolder()) : null);
+        if (input.isDefaultAutoCommit() != null) {
+            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
+    protected C createDataSourceContainerFromInput(@NotNull DBPDriver driver) {
+        DBPConnectionConfiguration dsConfig = new DBPConnectionConfiguration();
+        WebDataSourceUtils.setConnectionConfiguration(driver, dsConfig, input);
+        C newDataSource = registry.createDataSource(driver, dsConfig);
+
+        newDataSource.setSavePassword(true);
+        newDataSource.setName(CommonUtils.notNull(input.getName(), "NewConnection"));
+        newDataSource.setDescription(input.getDescription());
+        newDataSource.setConnectionReadOnly(input.isReadOnly());
+        if (input.getFolder() != null) {
+            newDataSource.setFolder(registry.getFolder(input.getFolder()));
+        }
+        return newDataSource;
+    }
+
+
+}
@@ -36,7 +36,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;
        }
@@ -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.
@@ -407,12 +407,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);
    }

@@ -16,55 +16,54 @@
 */
 package io.cloudbeaver;

+import io.cloudbeaver.model.WebConnectionConfig;
 import io.cloudbeaver.model.WebConnectionInfo;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.utils.WebDataSourceUtils;
 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.navigator.DBNModel;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.rm.RMUtils;
+import org.jkiss.dbeaver.model.security.SMControllerUtils;
+import org.jkiss.dbeaver.model.security.SMObjectType;
 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.*;

-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 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(),
@@ -72,9 +71,36 @@ 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);
+                }
+            }
+
+        };
+    }
+
+    @NotNull
+    public BaseProjectSettings getProjectSettings() {
+        return projectSettings;
    }

    @Nullable
@@ -83,6 +109,14 @@ public class WebSessionProjectImpl extends WebProjectImpl {
        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() {
@@ -159,7 +193,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
     */
    @NotNull
    public synchronized WebConnectionInfo addConnection(@NotNull DBPDataSourceContainer dataSourceContainer) {
-        WebConnectionInfo connection = new WebConnectionInfo(webSession, dataSourceContainer);
+        WebConnectionInfo connection = createConnectionInfo(dataSourceContainer);
        synchronized (connections) {
            connections.put(dataSourceContainer.getId(), connection);
        }
@@ -184,6 +218,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
     *
     * @return connections from cache.
     */
+    @NotNull
    public List<WebConnectionInfo> getConnections() {
        if (!registryIsLoaded) {
            addDataSourcesToCache();
@@ -237,4 +272,100 @@ public class WebSessionProjectImpl extends WebProjectImpl {
        }
        return sendDataSourceUpdatedEvent;
    }
+
+    @NotNull
+    public WebConnectionInfo createConnectionInfo(@NotNull DBPDataSourceContainer dataSourceDescriptor) {
+        return new WebConnectionInfo(webSession, dataSourceDescriptor);
+    }
+
+    @NotNull
+    public WebConnectionInfo createConnection(@NotNull Map<String, Object> configMap) throws DBWebException {
+        if (CommonUtils.isEmpty(configMap)) {
+            throw new DBWebException("Connection configuration parameters are missing");
+        }
+        DBPDataSourceContainer newDataSource = getDataSourceContainerFromInput(getConnectionConfigInput(configMap));
+        return addDataSourceToProject(newDataSource);
+    }
+
+    @NotNull
+    public WebConnectionInfo addDataSourceToProject(@NotNull DBPDataSourceContainer newDataSource) throws DBWebException {
+        DBPDataSourceRegistry registry = getDataSourceRegistry();
+        try {
+            registry.addDataSource(newDataSource);
+            registry.checkForErrors();
+        } catch (DBException e) {
+            registry.removeDataSource(newDataSource);
+            throw new DBWebException("Failed to create connection", e);
+        }
+
+        WebConnectionInfo connectionInfo = addConnection(newDataSource);
+        webSession.addInfoMessage("New connection was created - " + WebDataSourceUtils.getConnectionContainerInfo(
+            newDataSource));
+        log.info(String.format(
+            "New connection was created: [info=%s, user=%s]",
+            WebDataSourceUtils.getConnectionContainerInfo(newDataSource),
+            webSession.getUserId()
+        ));
+        return connectionInfo;
+    }
+
+    @NotNull
+    public WebConnectionInfo updateConnection(@Nullable Map<String, Object> configMap) throws DBWebException {
+        WebConnectionConfig config = getConnectionConfigInput(configMap);
+        WebConnectionInfo connectionInfo = getWebConnectionInfo(config.getConnectionId());
+        DataSourceDescriptor dataSource = (DataSourceDescriptor) connectionInfo.getDataSourceContainer();
+        webSession.addInfoMessage("Update connection - " + WebDataSourceUtils.getConnectionContainerInfo(dataSource));
+
+        DBPDataSourceRegistry registry = getDataSourceRegistry();
+        getInputConfigHandler(config).updateDataSource(dataSource);
+        connectionInfo.setCredentialsSavedInSession(null);
+        try {
+            registry.updateDataSource(dataSource);
+            registry.checkForErrors();
+        } catch (DBException e) {
+            throw new DBWebException("Failed to update connection", e);
+        }
+        return connectionInfo;
+    }
+
+    public boolean deleteConnection(@NotNull String connectionId) throws DBWebException {
+        WebConnectionInfo connectionInfo = getWebConnectionInfo(connectionId);
+        webSession.addInfoMessage("Delete connection - " +
+            WebDataSourceUtils.getConnectionContainerInfo(connectionInfo.getDataSourceContainer()));
+        closeAndDeleteConnection(connectionInfo);
+
+        log.info(String.format(
+            "Connection deleted: [info=%s, userId=%s]",
+            WebDataSourceUtils.getConnectionContainerInfo(connectionInfo.getDataSourceContainer()),
+            webSession.getUserId()
+        ));
+        return true;
+    }
+
+    @NotNull
+    private WebConnectionInfo closeAndDeleteConnection(@NotNull WebConnectionInfo connectionInfo) throws DBWebException {
+        DBPDataSourceContainer dataSourceContainer = connectionInfo.getDataSourceContainer();
+        WebDataSourceUtils.disconnectDataSource(webSession, dataSourceContainer);
+        DBPDataSourceRegistry registry = getDataSourceRegistry();
+        registry.removeDataSource(dataSourceContainer);
+        removeConnection(dataSourceContainer);
+        return connectionInfo;
+    }
+
+    @NotNull
+    public DataSourceDescriptor getDataSourceContainerFromInput(@NotNull WebConnectionConfig configInput) throws DBWebException {
+        return getInputConfigHandler(configInput).createDataSourceContainer();
+    }
+
+    @NotNull
+    public WebConnectionConfig getConnectionConfigInput(@Nullable Map<String, Object> configMap) {
+        return new WebConnectionConfig(configMap == null ? Map.of() : configMap);
+    }
+
+    @NotNull
+    protected WebConnectionConfigInputHandler getInputConfigHandler(@NotNull WebConnectionConfig configInput) {
+        return new WebConnectionConfigInputHandler<>(webSession, getDataSourceRegistry(), configInput);
+    }
+
+
 }
@@ -74,4 +74,8 @@ public interface SMAuthProviderExternal<AUTH_SESSION extends SMSession> extends
     */
    default void postAuthentication() {}

+    @Override
+    default boolean supportsOpeningSessionAsChild() {
+        return true;
+    }
 }
@@ -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);
+    }
+}
@@ -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 {

@@ -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;
+    }
+}
@@ -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,13 +16,14 @@
 */
 package io.cloudbeaver.model;

+import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.meta.Property;
-import org.jkiss.utils.CommonUtils;

 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,70 +54,71 @@ 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 Map<String, Object> externalParameters;
    private List<WebNetworkHandlerConfigInput> networkHandlersConfig;
    private DBPDriverConfigurationType configurationType;
    private String selectedSecretId;
-    private boolean defaultAutoCommit;
+    private Boolean defaultAutoCommit;
    private String defaultCatalogName;
    private String defaultSchemaName;
+    @NotNull
+    private Map<String, String> defaultUserPreferences = new LinkedHashMap<>();

    public WebConnectionConfig() {
    }

-    public WebConnectionConfig(Map<String, Object> params) {
-        if (!CommonUtils.isEmpty(params)) {
-            connectionId = JSONUtils.getString(params, "connectionId");
-            driverId = JSONUtils.getString(params, "driverId");
+    public WebConnectionConfig(@NotNull Map<String, Object> params) {
+        connectionId = JSONUtils.getString(params, "connectionId");
+        driverId = JSONUtils.getString(params, "driverId");

-            host = JSONUtils.getString(params, "host");
-            port = JSONUtils.getString(params, "port");
-            serverName = JSONUtils.getString(params, "serverName");
-            databaseName = JSONUtils.getString(params, "databaseName");
-            url = JSONUtils.getString(params, "url");
+        host = JSONUtils.getString(params, "host");
+        port = JSONUtils.getString(params, "port");
+        serverName = JSONUtils.getString(params, "serverName");
+        databaseName = JSONUtils.getString(params, "databaseName");
+        url = JSONUtils.getString(params, "url");

-            name = JSONUtils.getString(params, "name");
-            description = JSONUtils.getString(params, "description");
-            folder = JSONUtils.getString(params, "folder");
+        name = JSONUtils.getString(params, "name");
+        description = JSONUtils.getString(params, "description");
+        folder = JSONUtils.getString(params, "folder");

-            properties = JSONUtils.getObjectOrNull(params, "properties");
-            userName = JSONUtils.getString(params, "userName");
-            userPassword = JSONUtils.getString(params, "userPassword");
-            selectedSecretId = JSONUtils.getString(params, "selectedSecretId");
+        properties = JSONUtils.getObjectOrNull(params, "properties");
+        userName = JSONUtils.getString(params, "userName");
+        userPassword = JSONUtils.getString(params, "userPassword");
+        selectedSecretId = JSONUtils.getString(params, "selectedSecretId");

-            authModelId = JSONUtils.getString(params, "authModelId");
-            credentials = JSONUtils.getObjectOrNull(params, "credentials");
-            saveCredentials = JSONUtils.getBoolean(params, "saveCredentials");
-            sharedCredentials = JSONUtils.getBoolean(params, "sharedCredentials");
+        authModelId = JSONUtils.getString(params, "authModelId");
+        credentials = JSONUtils.getObjectOrNull(params, "credentials");
+        saveCredentials = JSONUtils.getBoolean(params, "saveCredentials");
+        sharedCredentials = JSONUtils.getBoolean(params, "sharedCredentials");

-            mainPropertyValues = JSONUtils.getObjectOrNull(params, "mainPropertyValues");
-            providerProperties = JSONUtils.getObjectOrNull(params, "providerProperties");
+        mainPropertyValues = JSONUtils.getObjectOrNull(params, "mainPropertyValues");
+        providerProperties = JSONUtils.getObjectOrNull(params, "providerProperties");
+        expertSettingsValues = JSONUtils.getObjectOrNull(params, "expertSettingsValues");
+        keepAliveInterval = JSONUtils.getInteger(
+            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);
+        defaultCatalogName = JSONUtils.getString(
+            expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_DEFAULT_CATALOG);
+        defaultSchemaName = JSONUtils.getString(
+            expertSettingsValues != null ? expertSettingsValues : params,
+            WebExpertSettingsProperties.PROP_DEFAULT_SCHEMA
+        );

-            expertSettingsValues = JSONUtils.getObjectOrNull(params, "expertSettingsValues");
-            keepAliveInterval = JSONUtils.getInteger(
-                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);
-            defaultCatalogName = JSONUtils.getString(
-                expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_DEFAULT_CATALOG);
-            defaultSchemaName = JSONUtils.getString(
-                expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_DEFAULT_SCHEMA);
+        String configType = JSONUtils.getString(params, "configurationType");
+        configurationType = configType == null ? null : DBPDriverConfigurationType.valueOf(configType);

-            String configType = JSONUtils.getString(params, "configurationType");
-            configurationType = configType == null ? null : DBPDriverConfigurationType.valueOf(configType);
-            externalParameters = JSONUtils.getObjectOrNull(params, "externalParameters");
-
-            networkHandlersConfig = new ArrayList<>();
-            for (Map<String, Object> nhc : JSONUtils.getObjectList(params, "networkHandlersConfig")) {
-                networkHandlersConfig.add(new WebNetworkHandlerConfigInput(nhc));
-            }
+        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));
        }
    }

@@ -125,102 +127,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
@@ -228,42 +306,79 @@ 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 Map<String, Object> getExternalParameters() {
-        return externalParameters;
+    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;
    }
 }
@@ -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,9 +16,11 @@
 */
 package io.cloudbeaver.model;

+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,11 +40,13 @@ 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.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;
@@ -58,7 +62,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";
@@ -126,7 +129,7 @@ public class WebConnectionInfo {
        if (canViewReadOnlyConnections()) {
            return dataSourceContainer.getConnectionConfiguration().getHostName();
        }
-        return SECURED_VALUE;
+        return CBConstants.SECURED_VALUE;
    }

    @Property
@@ -134,7 +137,7 @@ public class WebConnectionInfo {
        if (canViewReadOnlyConnections()) {
            return dataSourceContainer.getConnectionConfiguration().getHostPort();
        }
-        return SECURED_VALUE;
+        return CBConstants.SECURED_VALUE;
    }

    @Property
@@ -147,7 +150,7 @@ public class WebConnectionInfo {
        if (canViewReadOnlyConnections()) {
            return dataSourceContainer.getConnectionConfiguration().getDatabaseName();
        }
-        return SECURED_VALUE;
+        return CBConstants.SECURED_VALUE;
    }

    @Property
@@ -155,7 +158,7 @@ public class WebConnectionInfo {
        if (canViewReadOnlyConnections()) {
            return dataSourceContainer.getConnectionConfiguration().getUrl();
        }
-        return SECURED_VALUE;
+        return CBConstants.SECURED_VALUE;
    }

    @Property
@@ -251,6 +254,7 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public String[] getFeatures() {
        List<String> features = new ArrayList<>();

@@ -280,11 +284,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);
@@ -299,11 +321,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) {
@@ -319,21 +343,37 @@ public class WebConnectionInfo {
            !dataSourceContainer.getDriver().isAnonymousAccess();
    }

+    public void validateConnection() throws DBWebException {
+
+    }
+
    // we don't show non-secured properties in FE when connecting to DB without saved credentials
    private boolean isAuthPropertiesEmpty() {
        return Arrays.stream(getAuthProperties()).allMatch(f -> f.hasFeature(DBConstants.PROP_FEATURE_NON_SECURED));
    }

    @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);
@@ -356,6 +396,7 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public List<WebNetworkHandlerConfig> getNetworkHandlersConfig() {
        var registry = NetworkHandlerRegistry.getInstance();
        return dataSourceContainer.getConnectionConfiguration()
@@ -370,20 +411,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;
    }
@@ -408,6 +452,7 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public Map<String, String> getMainPropertyValues() {
        Map<String, String> mainProperties = new LinkedHashMap<>();
        mainProperties.put(DBConstants.PROP_HOST, getHost());
@@ -463,7 +508,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;
@@ -503,18 +548,21 @@ public class WebConnectionInfo {
    }

    @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()
@@ -522,8 +570,8 @@ public class WebConnectionInfo {
            .collect(Collectors.toList());
    }

-    @NotNull
    @Property
+    @NotNull
    public List<String> getTools() {
        if (!session.hasPermission(RMConstants.PERMISSION_DATABASE_DEVELOPER)) {
            return List.of();
@@ -542,4 +590,5 @@ public class WebConnectionInfo {
    public void setCredentialsSavedInSession(@Nullable Boolean credentialsSavedInSession) {
        this.credentialsSavedInSession = credentialsSavedInSession;
    }
+
 }
@@ -1,6 +1,7 @@
 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;
@@ -52,35 +53,35 @@ 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);
        }
    }
@@ -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;
@@ -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) {
@@ -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;
@@ -136,13 +139,14 @@ public class WebPropertyInfo {
    @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 &&
+            (!showProtected && 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);
@@ -243,9 +247,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) {
@@ -305,4 +311,13 @@ public class WebPropertyInfo {
            READ_ONLY
        }
    }
+
+    @NotNull
+    private static String maskValue(@Nullable Object value) {
+        if (value == null || value.toString().isEmpty()) {
+            return "";
+        } else {
+            return CBConstants.SECURED_VALUE;
+        }
+    }
 }
@@ -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 {};
+}
@@ -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;
+}
@@ -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();
+}
@@ -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;
+	}
+}
@@ -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;
+	}
+}
@@ -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;
+	}
+}
@@ -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;
+}
@@ -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;
+}
@@ -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;
+}
@@ -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 {};
+}
@@ -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 "";
+}
@@ -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
@@ -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,11 +25,13 @@ 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;
@@ -49,7 +51,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 +61,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,6 +77,18 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
        throw new IllegalStateException("File controller is not supported by " + getClass().getSimpleName());
    }

+    @NotNull
+    @Override
+    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());
+    }
+
    @Nullable
    @Override
    public Path getDefaultWorkingFolder() {
@@ -162,6 +177,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,
@@ -198,24 +214,22 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
        }
    }

+    @NotNull
    @Override
    public Object start(IApplicationContext context) {
        initializeApplicationServices();
        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);
+            return EXIT_ERROR_UNSPECIFIED;
        }
-        return null;
+        return EXIT_OK;
    }

    protected abstract void startServer() throws DBException;

+    @NotNull
    @Override
    public synchronized String getApplicationInstanceId() throws DBException {
        if (instanceId == null) {
@@ -240,6 +254,7 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
        return BaseWorkspaceImpl.readWorkspaceIdProperty();
    }

+    @NotNull
    @Override
    public Path getWorkspaceDirectory() {
        return getServerConfigurationController().getWorkspacePath();
@@ -254,6 +269,7 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
        }
    }

+    @NotNull
    @Override
    public WSEventController getEventController() {
        return null;
@@ -274,9 +290,14 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
        }
    }

-    @Nullable
    @Override
-    public ApplicationInstanceController getInstanceServer() {
-        return instanceServer;
+    public boolean isAnonymousAccessEnabled() {
+        return getAppConfiguration().isAnonymousAccessEnabled();
+    }
+
+    @NotNull
+    @Override
+    public WebFeatureRegistry getFeatureRegistry() {
+        return WebFeatureRegistry.getInstance();
    }
 }
@@ -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;
@@ -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,19 @@ public interface ServletApplication extends DBPApplication {
        return false;
    }

+    @NotNull
    ServletAppConfiguration getAppConfiguration();

+    @NotNull
    ServletServerConfiguration getServerConfiguration();

+    @NotNull
    Path getDataDirectory(boolean create);

+    @NotNull
    Path getWorkspaceDirectory();

+    @NotNull
    Path getHomeDirectory();

    boolean isMultiNode();
@@ -58,30 +65,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,10 +106,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();
 }
@@ -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();
    }
@@ -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();
@@ -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,16 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
        return ((DBNResourceManagerRoot) getParentNode()).getResourceController();
    }

+    @NotNull
    @Deprecated
    @Override
    public String getNodeItemPath() {
        return getParentNode().getNodeItemPath() + "/" + getName();
    }

+    @Nullable
    @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 +149,7 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
        return project;
    }

+    @NotNull
    @Override
    public String toString() {
        return getNodeDisplayName();
@@ -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,16 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
        throw new DBException("Can't detect resource root node");
    }

+    @NotNull
    @Deprecated
    @Override
    public String getNodeItemPath() {
        return getParentNode().getNodeItemPath() + "/" + getNodeDisplayName();
    }

+    @Nullable
    @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 +179,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 +200,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
        }
    }

+    @NotNull
    @Override
    public String toString() {
        return getNodeDisplayName();
@@ -50,6 +50,7 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
        return resourceController;
    }

+    @NotNull
    @Override
    public String getNodeType() {
        return "rm";
@@ -61,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;
@@ -81,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()) {
@@ -110,6 +115,7 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
        return projects;
    }

+    @NotNull
    @Deprecated
    @Override
    public String getNodeItemPath() {
@@ -117,8 +123,9 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
        return NodePathType.ext.getPrefix() + getNodeDisplayName();
    }

+    @Nullable
    @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;
    }
@@ -141,6 +148,9 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
            case PROJECT_ADD:
                addProjectNode(event.getProject());
                break;
+            case PROJECT_UPDATE:
+                updateProjectNode(event.getProject());
+                break;
        }
    }

@@ -187,4 +197,14 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
    private void addProjectNode(RMProject project) {
        projects = ArrayUtils.add(DBNResourceManagerProject.class, projects, new DBNResourceManagerProject(this, project));
    }
+
+    private void updateProjectNode(@NotNull RMProject project) {
+        var projectNode = getProjectNode(project);
+        projectNode.ifPresent(
+            dbnResourceManagerProject -> {
+                dbnResourceManagerProject.getProject().setName(project.getName());
+                dbnResourceManagerProject.getProject().setDescription(project.getDescription());
+            }
+        );
+    }
 }
@@ -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,22 +51,21 @@ 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 {
@@ -85,6 +84,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,9 +97,9 @@ public abstract class BaseLocalResourceController implements RMController {
    public void setProjectProperty(
        @NotNull String projectId,
        @NotNull String propName,
-        @NotNull Object propValue
+        @Nullable Object propValue
    ) throws DBException {
-        BaseWebProjectImpl webProject = getWebProject(projectId, false);
+        RMLocalProject webProject = getWebProject(projectId, false);
        doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
            () -> {
                log.debug("Updating value for property '" + propName + "' in project '" + projectId + "'");
@@ -159,7 +159,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 +190,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 +215,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 +226,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 +243,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 +269,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 +284,19 @@ public abstract class BaseLocalResourceController implements RMController {
        }
    }

-    protected abstract BaseWebProjectImpl 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 +314,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,
@@ -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,12 +16,12 @@
 */
 package io.cloudbeaver.model.rm.local;

-import io.cloudbeaver.BaseWebProjectImpl;
 import io.cloudbeaver.DBWConstants;
 import io.cloudbeaver.model.app.ServletApplication;
 import io.cloudbeaver.service.security.SMUtils;
 import io.cloudbeaver.service.sql.WebSQLConstants;
 import io.cloudbeaver.utils.ServletAppUtils;
+import io.cloudbeaver.utils.WebRMUtils;
 import io.cloudbeaver.utils.file.UniversalFileVisitor;
 import org.eclipse.core.runtime.IPath;
 import org.jkiss.code.NotNull;
@@ -33,12 +33,14 @@ 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.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.rm.*;
-import org.jkiss.dbeaver.model.security.SMController;
+import org.jkiss.dbeaver.model.security.SMAdminController;
 import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.model.sql.DBQuotaException;
 import org.jkiss.dbeaver.model.websocket.event.MessageType;
@@ -78,20 +80,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, BaseWebProjectImpl> projectRegistries = new LinkedHashMap<>();
+    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,29 +104,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 BaseWebProjectImpl getWebProject(String projectId, boolean refresh) throws DBException {
+    protected RMLocalProject getWebProject(@NotNull String projectId, boolean refresh) throws DBException {
        synchronized (projectRegistries) {
-            BaseWebProjectImpl project = projectRegistries.get(projectId);
+            RMLocalProject project = projectRegistries.get(projectId);
            if (project == null || refresh) {
-                SessionContextImpl sessionContext = new SessionContextImpl(null);
-                RMProject rmProject = makeProjectFromId(projectId, false);
-                project = createWebProjectImpl(projectId, sessionContext, rmProject);
+                project = createWebProjectImpl(projectId, new SessionContextImpl(null));
+                if (project.getProjectType() == RMProjectType.SHARED) {
+                    project.setProjectInfo(sharedProjectsMetadataInfo.getProjectInfo(projectId));
+                }
                projectRegistries.put(projectId, project);
            }
            return project;
@@ -130,12 +139,11 @@ public class LocalResourceController extends BaseLocalResourceController {
    }

    @NotNull
-    protected InternalWebProjectImpl createWebProjectImpl(
-        String projectId,
-        SessionContextImpl sessionContext,
-        RMProject rmProject
+    protected RMLocalProject createWebProjectImpl(
+        @NotNull String projectId,
+        @NotNull SessionContextImpl sessionContext
    ) throws DBException {
-        return new InternalWebProjectImpl(sessionContext, rmProject, getProjectPath(projectId));
+        return new RMLocalProject(workspace, sessionContext, getProjectPath(projectId), WebRMUtils.parseProjectName(projectId).getType());
    }

    @NotNull
@@ -170,11 +178,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]);
@@ -190,7 +193,7 @@ public class LocalResourceController extends BaseLocalResourceController {
            .stream()
            .filter(smObjectPermissions -> CommonUtils.isNotEmpty(smObjectPermissions.getObjectId()))
            .map(projectPermission -> makeProjectFromPath(
-                sharedProjectsPath.resolve(parseProjectNameUnsafe(projectPermission.getObjectId()).getName()),
+                sharedProjectsPath.resolve(WebRMUtils.parseProjectNameUnsafe(projectPermission.getObjectId()).getName()),
                Arrays.stream(projectPermission.getPermissions()).map(RMProjectPermission::fromPermission).collect(Collectors.toSet()),
                RMProjectType.SHARED, true)
            )
@@ -256,7 +259,7 @@ public class LocalResourceController extends BaseLocalResourceController {
                var allPaths = list.toList();
                for (Path path : allPaths) {
                    var projectPerms = getProjectPermissions(
-                        makeProjectIdFromPath(path, RMProjectType.SHARED),
+                        RMUtils.makeProjectIdFromPath(path, RMProjectType.SHARED),
                        RMProjectType.SHARED
                    );
                    var rmProject = makeProjectFromPath(path, projectPerms, RMProjectType.SHARED, false);
@@ -281,50 +284,77 @@ public class LocalResourceController extends BaseLocalResourceController {
            }
        }
        validateResourcePath(name);
-        RMProject project;
+        validateProjectName(null, name);
        var projectPath = sharedProjectsPath.resolve(name);
        if (Files.exists(projectPath)) {
            throw new DBException("Project '" + name + "' already exists");
        }
-        project = makeProjectFromPath(projectPath, Set.of(), RMProjectType.SHARED, false);
-        if (project == null) {
-            throw new DBException("Project '" + name + "' not created");
-        }
+        RMLocalProject webProject = new RMLocalProject(workspace, new SessionContextImpl(null), projectPath, RMProjectType.SHARED);
+        webProject.updateProject(name, description);
+        RMProject rmProject = createRmProjectFromWebProject(projectPath, webProject, new String[0]);
        try {
-            log.debug("Creating project '" + project.getId() + "'");
+            log.debug("Creating project '" + rmProject.getId() + "'");
            Files.createDirectories(projectPath);
-            if (ServletAppUtils.getServletApplication().isMultiNode()) {
-                createResourceTypeFolders(projectPath);
-            }
-            fireRmProjectAddEvent(project);
-            return project;
+            fireRmProjectAddEvent(rmProject);
+            return rmProject;
        } catch (IOException e) {
            throw new DBException("Error creating project path", e);
        }
    }

+    @NotNull
    @Override
-    public void deleteProject(@NotNull String projectId) throws DBException {
-        try (var projectLock = lockController.lock(projectId, "deleteProject")) {
-            RMProject project = makeProjectFromId(projectId, false);
+    public RMProject updateProject(@NotNull String projectId, @NotNull RMProjectInfo projectInfo) throws DBException {
+        validateProjectName(projectId, projectInfo.getName());
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("updateProject"))) {
+            RMLocalProject project = getWebProject(projectId, false);
            Path targetPath = getProjectPath(projectId);
            if (!Files.exists(targetPath)) {
-                log.debug(MessageFormat.format("Project folder ''{0}'' is not found", projectId));
+                throw new DBException("Project folder '" + projectId + "' not found");
+            }
+            if (!project.canUpdateProjectName()) {
+                throw new DBException("Project '" + projectId + "' is not shared");
+            }
+            project.updateProject(projectInfo.getName(), projectInfo.getDescription());
+            sharedProjectsMetadataInfo.updateProjectInfo(projectId, projectInfo);
+            return WebRMUtils.createRmProjectFromWebProject(project);
+        }
+    }
+
+    private void validateProjectName(@Nullable String projectId, @Nullable String name) throws DBException {
+        boolean duplicatedName = Arrays.stream(listAllSharedProjects())
+            .filter(p -> !p.getId().equals(projectId))
+            .map(RMProject::getName)
+            .noneMatch(n -> n.equalsIgnoreCase(name));
+        if (!duplicatedName) {
+            throw new DBException("Project name '" + name + "' is already used");
+        }
+    }
+
+    @Override
+    public void deleteProject(@NotNull String projectId) throws DBException {
+        try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("deleteProject"))) {
+            Path targetPath = getProjectPath(projectId);
+            if (!Files.exists(targetPath)) {
+                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);
@@ -384,6 +414,15 @@ public class LocalResourceController extends BaseLocalResourceController {
    @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(
@@ -591,7 +630,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();
@@ -600,7 +640,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) {
@@ -614,29 +654,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)) {
@@ -668,7 +734,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()) {
@@ -740,7 +806,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" : ""));
            }
@@ -828,7 +894,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()
@@ -873,9 +939,9 @@ 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);
-            BaseWebProjectImpl webProject = getWebProject(projectId, false);
+            RMLocalProject webProject = getWebProject(projectId, false);
            doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
                () -> {
                    log.debug("Updating resource property '" + propertyName + "' in project '" + projectId + "'");
@@ -894,9 +960,9 @@ 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);
-            BaseWebProjectImpl webProject = getWebProject(projectId, false);
+            RMLocalProject webProject = getWebProject(projectId, false);
            doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
                () -> {
                    log.debug("Updating resource '" + resourcePath + "' properties in project '" + projectId + "'");
@@ -930,15 +996,9 @@ public class LocalResourceController extends BaseLocalResourceController {
        }
    }

-
-    private String makeProjectIdFromPath(Path path, RMProjectType type) {
-        String projectName = path.getFileName().toString();
-        return type.getPrefix() + "_" + projectName;
-    }
-
    @Nullable
-    protected RMProject makeProjectFromId(String projectId, boolean loadPermissions) throws DBException {
-        var projectName = parseProjectName(projectId);
+    protected RMProject makeProjectFromId(@NotNull String projectId, boolean loadPermissions) throws DBException {
+        var projectName = WebRMUtils.parseProjectName(projectId);
        var projectPath = getProjectPath(projectId);
        if (!Files.exists(projectPath)) {
            if (isPrivateProject(projectId) && isProjectOwner(projectId)) {
@@ -975,50 +1035,14 @@ public class LocalResourceController extends BaseLocalResourceController {
            .flatMap(rmProjectPermission -> rmProjectPermission.getAllPermissions().stream())
            .toArray(String[]::new);

-        RMProject project = new RMProject();
-        String projectName = path.getFileName().toString();
-        project.setName(projectName);
-        project.setId(makeProjectIdFromPath(path, type));
-        project.setType(type);
-        project.setProjectPermissions(allProjectPermissions);
-        if (Files.exists(path)) {
-            try {
-                project.setCreateTime(
-                    OffsetDateTime.ofInstant(Files.getLastModifiedTime(path).toInstant(), ZoneId.of("UTC")).toInstant().toEpochMilli());
-            } catch (IOException e) {
-                log.error(e);
-            }
+        RMLocalProject webProject = new RMLocalProject(workspace, new SessionContextImpl(null), path, type);
+        if (type == RMProjectType.SHARED) {
+            webProject.setProjectInfo(sharedProjectsMetadataInfo.getProjectInfo(webProject.getId()));
        }
-        // Resource types
-        project.setResourceTypes(ResourceTypeRegistry.getInstance().getResourceTypes()
-            .stream()
-            .filter(ResourceTypeDescriptor::isManagable)
-            .map(RMResourceType::new)
-            .toArray(RMResourceType[]::new));
-
-        return project;
+        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);
@@ -1036,7 +1060,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);
@@ -1055,7 +1079,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);
        }
@@ -1074,8 +1102,8 @@ public class LocalResourceController extends BaseLocalResourceController {
        return result;
    }

-    protected Path getProjectPath(String projectId) throws DBException {
-        RMProjectName project = parseProjectName(projectId);
+    protected Path getProjectPath(@NotNull String projectId) throws DBException {
+        RMProjectName project = WebRMUtils.parseProjectName(projectId);
        RMProjectType type = project.getType();
        String projectName = project.getName();
        switch (type) {
@@ -1165,7 +1193,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);
            }
@@ -1179,16 +1207,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
@@ -1198,16 +1224,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;
@@ -1215,78 +1244,48 @@ 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
+            );
        }
    }

-    public static class RMProjectName {
-        String prefix;
-        String name;
-
-        private RMProjectName(String prefix, String name) {
-            this.prefix = prefix;
-            this.name = name;
-        }
-
-        public String getPrefix() {
-            return prefix;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public RMProjectType getType() {
-            return RMProjectType.getByPrefix(prefix);
-        }
-    }
-
-    public static RMProjectName parseProjectName(String projectId) throws DBException {
-        if (CommonUtils.isEmpty(projectId)) {
-            throw new DBException("Project id is empty");
-        }
-        return parseProjectNameUnsafe(projectId);
-    }
-
-    private static RMProjectName parseProjectNameUnsafe(String projectId) {
-        String prefix;
-        String name;
-        int divPos = projectId.indexOf("_");
-        if (divPos < 0) {
-            prefix = RMProjectType.USER.getPrefix();
-            name = projectId;
-        } else {
-            prefix = projectId.substring(0, divPos);
-            name = projectId.substring(divPos + 1);
-        }
-        return new RMProjectName(prefix, name);
-    }
-
    public static boolean isGlobalProject(String projectId) {
-        RMProjectName rmProjectName = parseProjectNameUnsafe(projectId);
+        RMProjectName rmProjectName = WebRMUtils.parseProjectNameUnsafe(projectId);
        return RMProjectType.GLOBAL.getPrefix().equals(rmProjectName.getPrefix());
    }

    public static boolean isPrivateProject(String projectId) {
-        RMProjectName rmProjectName = parseProjectNameUnsafe(projectId);
+        RMProjectName rmProjectName = WebRMUtils.parseProjectNameUnsafe(projectId);
        return RMProjectType.USER.getPrefix().equals(rmProjectName.getPrefix());
    }

@@ -1297,9 +1296,32 @@ public class LocalResourceController extends BaseLocalResourceController {
    }

    public static boolean isProjectOwner(String projectId, String userId) {
-        RMProjectName rmProjectName = parseProjectNameUnsafe(projectId);
+        RMProjectName rmProjectName = WebRMUtils.parseProjectNameUnsafe(projectId);
        return RMProjectType.USER.getPrefix().equals(rmProjectName.getPrefix()) &&
            rmProjectName.name.equals(userId);
    }

+    @NotNull
+    private static RMProject createRmProjectFromWebProject(Path path, RMLocalProject webProject, String[] allProjectPermissions) {
+        RMProject project = WebRMUtils.createRmProjectFromWebProject(webProject);
+        project.setProjectPermissions(allProjectPermissions);
+        if (Files.exists(path)) {
+            try {
+                project.setCreateTime(
+                    OffsetDateTime.ofInstant(Files.getLastModifiedTime(path).toInstant(), ZoneId.of("UTC")).toInstant().toEpochMilli());
+            } catch (IOException e) {
+                log.error(e);
+            }
+        }
+        // Resource types
+        project.setResourceTypes(ResourceTypeRegistry.getInstance().getResourceTypes()
+            .stream()
+            .filter(ResourceTypeDescriptor::isManageable)
+            .map(RMResourceType::new)
+            .toArray(RMResourceType[]::new));
+
+        return project;
+    }
+
+
 }
@@ -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());
+        }
+    }
+}
@@ -0,0 +1,95 @@
+/*
+ * 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 org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.app.DBPWorkspace;
+import org.jkiss.dbeaver.model.auth.SMSessionContext;
+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.project.LocalProjectImpl;
+
+import java.nio.file.Path;
+
+public class RMLocalProject extends LocalProjectImpl {
+    @NotNull
+    private final RMProjectType projectType;
+    @Nullable
+    private RMProjectInfo projectInfo;
+
+    public RMLocalProject(
+        @NotNull DBPWorkspace workspace,
+        @Nullable SMSessionContext sessionContext,
+        @NotNull Path projectPath,
+        @NotNull RMProjectType type
+    ) {
+        super(workspace, sessionContext, projectPath);
+        this.projectType = type;
+    }
+
+    @Override
+    public boolean isVirtual() {
+        return true;
+    }
+
+    @NotNull
+    @Override
+    public String getId() {
+        return RMUtils.makeProjectIdFromPath(projectPath, projectType);
+    }
+
+    @Nullable
+    @Override
+    public String getDescription() {
+        if (projectInfo == null) {
+            return null;
+        }
+        return projectInfo.getDescription();
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        if (projectInfo == null || projectInfo.getName() == null) {
+            return projectPath.getFileName().toString();
+        }
+        return projectInfo.getName();
+    }
+
+    @NotNull
+    public RMProjectType getProjectType() {
+        return projectType;
+    }
+
+    @Override
+    public void updateProject(@Nullable String newName, @Nullable String description) throws DBException {
+        this.projectInfo = new RMProjectInfo();
+        projectInfo.setName(newName);
+        projectInfo.setDescription(description);
+    }
+
+    public void setProjectInfo(@NotNull RMProjectInfo projectInfo) {
+        this.projectInfo = projectInfo;
+    }
+
+    public boolean canUpdateProjectName() {
+        return RMProjectType.SHARED.equals(projectType);
+    }
+}
@@ -0,0 +1,41 @@
+/*
+ * 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 org.jkiss.dbeaver.model.rm.RMProjectType;
+
+public class RMProjectName {
+    String prefix;
+    String name;
+
+    public RMProjectName(String prefix, String name) {
+        this.prefix = prefix;
+        this.name = name;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public RMProjectType getType() {
+        return RMProjectType.getByPrefix(prefix);
+    }
+}
@@ -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,6 +28,7 @@ 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.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;
@@ -55,19 +55,27 @@ 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 = new WebSessionEventsFilter();
+    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();
        this.workspace.getAuthContext().addSession(this);
        this.userContext = createUserContext();
+        this.eventsFilter = new WebSessionEventsFilter(this);
    }

    @NotNull
@@ -101,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) {
@@ -115,11 +123,11 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
        }
    }

-    public synchronized boolean updateSMSession(SMAuthInfo smAuthInfo) throws DBException {
+    public boolean updateSMSession(SMAuthInfo smAuthInfo) throws DBException {
        return userContext.refresh(smAuthInfo);
    }

-    public synchronized void refreshUserData() {
+    public void refreshUserData() {
        try {
            userContext.refreshPermissions();
            if (userContext.isAuthorizedInSecurityManager()) {
@@ -149,8 +157,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);
    }

@@ -175,23 +183,29 @@ 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) {
@@ -225,7 +239,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);
    }

@@ -233,11 +247,16 @@ public abstract class BaseWebSession extends AbstractSessionPersistent {
        userContext.getAccessibleProjectIds().add(projectId);
    }

-    public void removeSessionProject(@Nullable String projectId) throws DBException {
+    public void updateSessionProject(@NotNull String projectId, @NotNull RMProjectInfo rmProjectInfo) 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() {
@@ -247,8 +266,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();
+    }
 }
@@ -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
+}
@@ -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);
        }
    }

@@ -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) {

    }

@@ -17,10 +17,12 @@
 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;

 public class WebHttpRequestInfo {
-    public static final String USER_AGENT = "User-Agent";
+    public static final String USER_AGENT = HttpConstants.HEADER_USER_AGENT;

    @Nullable
    private final String id;
@@ -30,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(
@@ -43,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;
    }
@@ -68,4 +86,9 @@ public class WebHttpRequestInfo {
    public String getLastRemoteUserAgent() {
        return lastRemoteUserAgent;
    }
+
+    @NotNull
+    public SessionType getSessionType() {
+        return sessionType;
+    }
 }
@@ -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,14 +42,10 @@ 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;
-import org.jkiss.dbeaver.model.rm.RMController;
-import org.jkiss.dbeaver.model.rm.RMProject;
-import org.jkiss.dbeaver.model.rm.RMProjectType;
-import org.jkiss.dbeaver.model.rm.RMUtils;
+import org.jkiss.dbeaver.model.rm.*;
 import org.jkiss.dbeaver.model.runtime.AbstractJob;
 import org.jkiss.dbeaver.model.runtime.BaseProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
@@ -69,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.
@@ -78,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;
@@ -95,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);
    }
@@ -128,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");
        }
@@ -154,7 +163,7 @@ public class WebSession extends BaseWebSession
            if (authTokens.isEmpty()) {
                return null;
            }
-            return authTokens.get(0);
+            return authTokens.getFirst();
        }
    }

@@ -191,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();
@@ -207,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();
        }
@@ -228,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();

@@ -257,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().getProjects());
+            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() {
@@ -307,12 +338,12 @@ public class WebSession extends BaseWebSession
            for (RMProject project : rmProjects) {
                createWebProject(project);
            }
-            if (user == null && application.getAppConfiguration().isAnonymousAccessEnabled()) {
+            if (user == null && application.isAnonymousAccessEnabled()) {
                WebProjectImpl anonymousProject = createWebProject(RMUtils.createAnonymousProject());
                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);
@@ -320,7 +351,8 @@ 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);
@@ -335,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));
    }
@@ -351,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();
        }
    }

@@ -399,9 +420,10 @@ public class WebSession extends BaseWebSession


    private synchronized void authAsAnonymousUser() throws DBException {
-        if (!application.getAppConfiguration().isAnonymousAccessEnabled()) {
+        if (!application.isAnonymousAccessEnabled()) {
            return;
        }
+
        SMAuthInfo authInfo = getSecurityController().authenticateAnonymousUser(this.id, getSessionParameters(), CB_SESSION_TYPE);
        updateSMSession(authInfo);
        notifySessionAuthChange();
@@ -418,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
@@ -440,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 {
@@ -472,7 +504,6 @@ public class WebSession extends BaseWebSession
    public void close() {
        try {
            resetNavigationModel();
-            resetSessionCache();
        } catch (Throwable e) {
            log.error(e);
        }
@@ -489,7 +520,6 @@ public class WebSession extends BaseWebSession
    public void close(boolean clearTokens, boolean sendSessionExpiredEvent) {
        try {
            resetNavigationModel();
-            resetSessionCache();
        } catch (Throwable e) {
            log.error(e);
        }
@@ -504,6 +534,7 @@ public class WebSession extends BaseWebSession
        super.close(clearTokens, sendSessionExpiredEvent);
    }

+    @NotNull
    private List<WebAuthInfo> clearAuthTokens() throws DBException {
        ArrayList<WebAuthInfo> tokensCopy;
        synchronized (authTokens) {
@@ -560,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();
        }
@@ -569,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) {
@@ -585,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);
@@ -626,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);
        }
@@ -641,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<>();
@@ -668,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);
@@ -721,7 +726,7 @@ public class WebSession extends BaseWebSession
                }
                return null;
            }
-            return authTokens.isEmpty() ? null : authTokens.get(0);
+            return authTokens.isEmpty() ? null : authTokens.getFirst();
        }
    }

@@ -732,7 +737,7 @@ public class WebSession extends BaseWebSession
        }
    }

-
+    @NotNull
    public List<WebAuthInfo> getAllAuthInfo() {
        synchronized (authTokens) {
            return new ArrayList<>(authTokens);
@@ -764,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);
@@ -787,7 +789,7 @@ public class WebSession extends BaseWebSession
        });
    }

-    private void removeAuthInfo(WebAuthInfo oldAuthInfo) {
+    private void removeAuthInfo(@NotNull WebAuthInfo oldAuthInfo) {
        oldAuthInfo.closeAuth();
        synchronized (authTokens) {
            authTokens.remove(oldAuthInfo);
@@ -813,6 +815,7 @@ public class WebSession extends BaseWebSession
        return oldInfo;
    }

+    @Nullable
    public List<DBACredentialsProvider> getContextCredentialsProviders() {
        return getAdapters(DBACredentialsProvider.class);
    }
@@ -831,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) {
@@ -843,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) {
@@ -861,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)) {
@@ -883,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;
@@ -899,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();
@@ -922,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);
    }

@@ -931,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) {
@@ -942,6 +947,7 @@ public class WebSession extends BaseWebSession
        return project;
    }

+    @NotNull
    public List<WebSessionProjectImpl> getAccessibleProjects() {
        return getWorkspace().getProjects();
    }
@@ -951,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();
        }
    }

@@ -978,11 +993,25 @@ 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);
    }

    @Override
-    public void removeSessionProject(@Nullable String projectId) throws DBException {
+    public void updateSessionProject(@NotNull String projectId, @NotNull RMProjectInfo rmProjectInfo) throws DBException {
+        super.updateSessionProject(projectId, rmProjectInfo);
+        var project = getProjectById(projectId);
+        if (project == null) {
+            return;
+        }
+        project.updateProjectInfo(rmProjectInfo.getName(), rmProjectInfo.getDescription());
+    }
+
+    @Override
+    public void removeSessionProject(@NotNull String projectId) throws DBException {
        super.removeSessionProject(projectId);
        var project = getProjectById(projectId);
        if (project == null) {
@@ -991,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();
@@ -1010,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);
        }
    }
@@ -1026,6 +1091,4 @@ public class WebSession extends BaseWebSession
        return true;
    }

-    private record PersistentAttribute(Object value) {
-    }
 }
@@ -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.
@@ -74,7 +74,7 @@ public class WebSessionAuthProcessor {
            }
        } catch (Exception e) {
            if (resetUserStateOnError) {
-                webSession.resetUserState();
+                webSession.resetUserState(false);
            }
            throw new DBException(e.getMessage(), e);
        }
@@ -118,6 +118,8 @@ public class WebSessionAuthProcessor {
                    // We may need to associate new credentials with active user
                    if (linkWithActiveUser) {
                        securityController.setCurrentUserCredentials(authProviderDescriptor.getId(), authAttrs);
+                        //link only first(main) credentials
+                        alreadyLoggedIn = true;
                    }
                }

@@ -21,18 +21,37 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.websocket.event.WSEvent;
 import org.jkiss.dbeaver.model.websocket.event.WSProjectResourceEvent;

+import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;

 public class WebSessionEventsFilter {
+    private final BaseWebSession session;
    private final Set<String> subscribedEventTopics = new CopyOnWriteArraySet<>();
    private final Set<String> subscribedProjectIds = new CopyOnWriteArraySet<>();
+    private final Map<String, List<WebTopicActivityListener>> topicActivityListeners = new ConcurrentHashMap<>();
+    private final Set<String> handledStartTopics = new CopyOnWriteArraySet<>();
+
+    public WebSessionEventsFilter(BaseWebSession session) {
+        this.session = session;
+    }

    public void subscribeOnEventTopic(@Nullable String topic) {
        if (topic == null) {
            return;
        }
        subscribedEventTopics.add(topic);
+
+        topicActivityListeners
+            .getOrDefault(topic, List.of()).stream()
+            .filter(listener -> !handledStartTopics.contains(listener.getTopicName()))
+            .forEach(listener -> {
+                listener.handelStartSubscriptionTopic(session);
+                handledStartTopics.add(topic);
+            });
    }

    public void unsubscribeFromEventTopic(@Nullable String topic) {
@@ -67,4 +86,10 @@ public class WebSessionEventsFilter {

        return true;
    }
+    
+    public void addTopicSubscribeListener(WebTopicActivityListener listener) {
+        topicActivityListeners
+            .computeIfAbsent(listener.getTopicName(), k -> new CopyOnWriteArrayList<>())
+            .add(listener);
+    }
 }
@@ -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;
@@ -62,12 +63,12 @@ public class WebSessionPreferenceStore extends AbstractUserPreferenceStore {
    }

    @Override
-    public String getDefaultString(String name) {
+    public String getDefaultString(@NotNull String name) {
        return parentStore.getDefaultString(name);
    }

    @Override
-    public boolean isDefault(String name) {
+    public boolean isDefault(@NotNull String name) {
        return !userPreferences.containsKey(name) && parentStore.isDefault(name);
    }

@@ -77,7 +78,7 @@ public class WebSessionPreferenceStore extends AbstractUserPreferenceStore {
    }

    @Override
-    public void setToDefault(String name) {
+    public void setToDefault(@NotNull String name) {
        throw new RuntimeException("Not implemented");
    }

@@ -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);
+        }
+    }
 }
@@ -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,11 +17,15 @@
 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.impl.auth.SessionContextImpl;
 import org.jkiss.dbeaver.model.rm.RMUtils;
@@ -36,6 +40,7 @@ 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;
@@ -87,7 +92,9 @@ public class WebSessionWorkspace implements DBPWorkspace {
    @NotNull
    @Override
    public List<WebSessionProjectImpl> getProjects() {
-        return accessibleProjects;
+        synchronized (accessibleProjects) {
+            return new ArrayList<>(accessibleProjects);
+        }
    }

    @Nullable
@@ -99,26 +106,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 +154,61 @@ 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);
    }

 }
@@ -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.
@@ -14,11 +14,11 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package io.cloudbeaver.server;
+package io.cloudbeaver.model.session;

-public interface HttpConstants {
-    String CONTENT_TYPE = "Content-Type";
+public interface WebTopicActivityListener {

-    String TYPE_JSON = "application/json";
-    String HEADER_AUTHORIZATION = "Authorization";
+    void handelStartSubscriptionTopic(BaseWebSession session);
+
+    String getTopicName();
 }
@@ -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() {
+    @NotNull
+    public String getSmSessionId() {
        return smSessionId;
    }

+    @Nullable
    private Set<String> getDefaultPermissions() {
-        return application.getAppConfiguration().isAnonymousAccessEnabled() ? null : Set.of();
+        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;
    }
@@ -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);
@@ -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;

@@ -110,7 +112,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() {
@@ -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;
+    }
 }
@@ -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;
+    }
 }
@@ -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());
    }

 }
@@ -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) {

@@ -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.
@@ -28,50 +28,34 @@ public class CBConstants {
    public static final String RUNTIME_PRODUCT_CONFIG_FILE_NAME = ".product.runtime.conf";
    public static final String AUTO_CONFIG_FILE_NAME = ".cloudbeaver.auto.conf";

-    public static final String PARAM_SERVER_CONFIGURATION = "server";
-    public static final String PARAM_SERVER_PORT = "serverPort";
-    public static final String PARAM_SERVER_HOST = "serverHost";
    public static final String PARAM_SERVER_NAME = "serverName";
    public static final String PARAM_FORCE_HTTPS = "forceHttps";
    public static final String PARAM_BIND_SESSION_TO_IP = "bindSessionToIp";
    public static final String PARAM_SUPPORTED_HOSTS = "supportedHosts";
-    public static final String PARAM_SSL_CONFIGURATION_PATH = "sslConfigurationPath";
-    public static final String PARAM_CONTENT_ROOT = "contentRoot";
-    public static final String PARAM_SERVER_URL = "serverURL";
-    public static final String PARAM_ROOT_URI = "rootURI";
-    public static final String PARAM_SERVICES_URI = "serviceURI";
-    public static final String PARAM_DRIVERS_LOCATION = "driversLocation";
-    public static final String PARAM_WORKSPACE_LOCATION = "workspaceLocation";
    //legacy path to a product.conf file
-    @Deprecated
    public static final String PARAM_PRODUCT_CONFIGURATION = "productConfiguration";
    public static final String PARAM_PRODUCT_SETTINGS = "productSettings";
    public static final String PARAM_EXTERNAL_PROPERTIES = "externalProperties";
-    public static final String PARAM_STATIC_CONTENT = "staticContent";
    public static final String PARAM_RESOURCE_QUOTAS = "resourceQuotas";
    public static final String PARAM_RESOURCE_MANAGER_ENABLED = "resourceManagerEnabled";
    public static final String PARAM_SECRET_MANAGER_ENABLED = "secretManagerEnabled";
    public static final String PARAM_SHOW_READ_ONLY_CONN_INFO = "showReadOnlyConnectionInfo";
    public static final String PARAM_CONN_GRANT_ANON_ACCESS = "grantConnectionsAccessToAnonymousTeam";
-    public static final String PARAM_AUTH_PROVIDERS = "authConfiguration";
    public static final String PARAM_DB_CONFIGURATION = "database";

    public static final String PARAM_SESSION_EXPIRE_PERIOD = "expireSessionAfterPeriod";

-    public static final String PARAM_DEVEL_MODE = "develMode";
-    public static final String PARAM_SECURITY_MANAGER = "enableSecurityManager";
    public static final String PARAM_SM_CONFIGURATION = "sm";
    public static final String PARAM_PASSWORD_POLICY_CONFIGURATION = "passwordPolicy";

    public static final int DEFAULT_SERVER_PORT = 8080;
-    //public static final String DEFAULT_SERVER_NAME = "CloudBeaver Web Server";
+
    public static final String DEFAULT_CONTENT_ROOT = "/var/www/cloudbeaver";
    public static final String DEFAULT_ROOT_URI = "/";
    public static final String DEFAULT_SERVICES_URI = "/api/";

    public static final String DEFAULT_DEPLOY_LOCATION = "/opt/cloudbeaver";
    public static final String DEFAULT_DRIVERS_LOCATION = DEFAULT_DEPLOY_LOCATION + "/drivers";
-    public static final String DEFAULT_WORKSPACE_LOCATION = DEFAULT_DEPLOY_LOCATION + "/workspace";
    public static final String DEFAULT_PRODUCT_CONFIGURATION = "conf/product.conf";
    public static final String DEFAULT_DATASOURCE_PERMISSIONS_CONFIGURATION = "data-sources-permissions.json";
    public static final String DEFAULT_ADMIN_NAME = "cbadmin";
@@ -84,18 +68,18 @@ public class CBConstants {
    public static final String VAR_HOST_DOCKER_INTERNAL = "host.docker.internal";

    public static final String VAR_AUTO_CB_SERVER_NAME = "CB_SERVER_NAME";
-    public static final String VAR_AUTO_CB_SERVER_URL = "CB_SERVER_URL";
    public static final String VAR_AUTO_CB_ADMIN_NAME = "CB_ADMIN_NAME";
    public static final String VAR_AUTO_CB_ADMIN_PASSWORD = "CB_ADMIN_PASSWORD";

    public static final String CB_SESSION_COOKIE_NAME = "cb-session-id";

-    public static final String APPLICATION_JSON = "application/json";
-
    public static final String ADMIN_AUTO_GRANT = "auto-grant";
    public static final String HOST_LOCALHOST = "localhost";
    public static final String HOST_127_0_0_1 = "127.0.0.1";

    public static final String BIND_SESSION_ENABLE = "enable";
    public static final String BIND_SESSION_DISABLE = "disable";
+    public static final String DEFAULT_CLOUD_PROJECT_NAME = "GlobalConfiguration";
+
+    public static final String SECURED_VALUE = "******";
 }
@@ -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,11 +20,14 @@ import io.cloudbeaver.WebProjectImpl;
 import io.cloudbeaver.model.app.ServletApplication;
 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.DBPPlatform;
 import org.jkiss.dbeaver.model.app.DBPProject;
+import org.jkiss.dbeaver.model.auth.SMSession;
 import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
 import org.jkiss.dbeaver.model.impl.app.BaseWorkspaceImpl;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.utils.CommonUtils;

 import java.io.IOException;
@@ -55,8 +58,14 @@ public class ServerGlobalWorkspace extends BaseWorkspaceImpl {
        this.application = application;
    }

+    @NotNull
    @Override
-    public void initializeProjects() {
+    protected SMSession acquireWorkspaceSession(@NotNull DBRProgressMonitor monitor) throws DBException {
+        return new ServerGlobalWorkspaceSession(this);
+    }
+
+    @Override
+    public void initializeProjects() throws DBException {
        initializeWorkspaceSession();

        // Load global project
@@ -106,4 +115,9 @@ public class ServerGlobalWorkspace extends BaseWorkspaceImpl {
        }
        return null;
    }
+
+    @Override
+    public boolean supportsRealmFeature(@NotNull String feature) {
+        return application.getAppConfiguration().isFeatureEnabled(feature);
+    }
 }
@@ -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.server;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.app.DBPWorkspace;
+import org.jkiss.dbeaver.model.impl.app.LocalWorkspaceSession;
+import org.jkiss.dbeaver.model.secret.DBSSecretController;
+
+public class ServerGlobalWorkspaceSession extends LocalWorkspaceSession {
+
+    public ServerGlobalWorkspaceSession(@NotNull DBPWorkspace workspace) {
+        super(workspace);
+    }
+
+    @Nullable
+    @Override
+    public DBSSecretController getSecretController() {
+        return super.getSecretController();
+    }
+}
@@ -18,6 +18,7 @@ package io.cloudbeaver.server;

 import io.cloudbeaver.utils.ServletAppUtils;
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.impl.preferences.AbstractPreferenceStore;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;

@@ -34,37 +35,37 @@ public class WebServerPreferenceStore extends AbstractPreferenceStore {
    }

    @Override
-    public boolean contains(String name) {
+    public boolean contains(@NotNull String name) {
        return productConf().containsKey(name) || parentStore.contains(name);
    }

    @Override
-    public boolean getBoolean(String name) {
+    public boolean getBoolean(@NotNull String name) {
        return toBoolean(getString(name));
    }

    @Override
-    public double getDouble(String name) {
+    public double getDouble(@NotNull String name) {
        return toDouble(getString(name));
    }

    @Override
-    public float getFloat(String name) {
+    public float getFloat(@NotNull String name) {
        return toFloat(getString(name));
    }

    @Override
-    public int getInt(String name) {
+    public int getInt(@NotNull String name) {
        return toInt(getString(name));
    }

    @Override
-    public long getLong(String name) {
+    public long getLong(@NotNull String name) {
        return toLong(getString(name));
    }

    @Override
-    public String getString(String name) {
+    public String getString(@NotNull String name) {
        Object value = productConf().get(name);
        if (value == null) {
            return parentStore.getString(name);
@@ -73,38 +74,38 @@ public class WebServerPreferenceStore extends AbstractPreferenceStore {
    }

    @Override
-    public boolean getDefaultBoolean(String name) {
+    public boolean getDefaultBoolean(@NotNull String name) {
        return getBoolean(name);
    }

    @Override
-    public double getDefaultDouble(String name) {
+    public double getDefaultDouble(@NotNull String name) {
        return getDouble(name);
    }

    @Override
-    public float getDefaultFloat(String name) {
+    public float getDefaultFloat(@NotNull String name) {
        return getFloat(name);
    }

    @Override
-    public int getDefaultInt(String name) {
+    public int getDefaultInt(@NotNull String name) {
        return getInt(name);
    }

    @Override
-    public long getDefaultLong(String name) {
+    public long getDefaultLong(@NotNull String name) {
        return getLong(name);
    }

    @Override
-    public String getDefaultString(String name) {
+    public String getDefaultString(@NotNull String name) {
        // TODO: split product.conf and runtime.product.conf
        return getString(name);
    }

    @Override
-    public boolean isDefault(String name) {
+    public boolean isDefault(@NotNull String name) {
        return true;
    }

@@ -114,68 +115,68 @@ public class WebServerPreferenceStore extends AbstractPreferenceStore {
    }

    @Override
-    public void setDefault(String name, double value) {
+    public void setDefault(@NotNull String name, double value) {
        setDefault(name, String.valueOf(value));
    }

    @Override
-    public void setDefault(String name, float value) {
+    public void setDefault(@NotNull String name, float value) {
        setDefault(name, String.valueOf(value));
    }

    @Override
-    public void setDefault(String name, int value) {
+    public void setDefault(@NotNull String name, int value) {
        setDefault(name, String.valueOf(value));
    }

    @Override
-    public void setDefault(String name, long value) {
+    public void setDefault(@NotNull String name, long value) {
        setDefault(name, String.valueOf(value));
    }

    @Override
-    public void setDefault(String name, String defaultObject) {
+    public void setDefault(@NotNull String name, @Nullable String defaultObject) {
        // do not store global default properties in product.conf
        this.parentStore.setDefault(name, defaultObject);
    }

    @Override
-    public void setDefault(String name, boolean value) {
+    public void setDefault(@NotNull String name, boolean value) {
        setDefault(name, String.valueOf(value));
    }

    @Override
-    public void setToDefault(String name) {
+    public void setToDefault(@NotNull String name) {
        parentStore.setToDefault(name);
    }

    @Override
-    public void setValue(String name, double value) {
+    public void setValue(@NotNull String name, double value) {
        parentStore.setValue(name, value);
    }

    @Override
-    public void setValue(String name, float value) {
+    public void setValue(@NotNull String name, float value) {
        parentStore.setValue(name, value);
    }

    @Override
-    public void setValue(String name, int value) {
+    public void setValue(@NotNull String name, int value) {
        parentStore.setValue(name, value);
    }

    @Override
-    public void setValue(String name, long value) {
+    public void setValue(@NotNull String name, long value) {
        parentStore.setValue(name, value);
    }

    @Override
-    public void setValue(String name, String value) {
+    public void setValue(@NotNull String name, @Nullable String value) {
        parentStore.setValue(name, value);
    }

    @Override
-    public void setValue(String name, boolean value) {
+    public void setValue(@NotNull String name, boolean value) {
        parentStore.setValue(name, value);
    }

@@ -45,4 +45,7 @@ public class WebSQLConstants {
    public static final String ATTR_SRID = "srid";
    public static final String ATTR_PROPERTIES = "properties";

+    public static final String TASK_CONFIRMATION_ATTR_PREFIX = "session_task_confirmation_";
+    public static final String SKIP_TASK_CONFIRMATIONS_ATTR = "skip_session_task_confirmations";
+    public static final int TASK_CONFIRMATION_TIMEOUT_SECONDS = 60;
 }
@@ -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.service.sql;

+import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.data.DBDAttributeConstraint;
 import org.jkiss.dbeaver.model.gis.DBGeometry;
 import org.jkiss.utils.CommonUtils;
@@ -27,6 +28,7 @@ import java.util.Map;
 */
 public class WebSQLDataFilterConstraint {

+    private String attributeName;
    private Integer attributePosition;
    private Integer orderPosition;
    private Boolean orderAsc;
@@ -38,8 +40,9 @@ public class WebSQLDataFilterConstraint {
    private WebSQLDataFilterConstraint() {
    }

-    public WebSQLDataFilterConstraint(Map<String, Object> map) {
-        this.attributePosition = CommonUtils.toInt(map.get("attributePosition"));
+    public WebSQLDataFilterConstraint(@NotNull Map<String, Object> map) {
+        this.attributeName = CommonUtils.toString(map.get("attributeName"));
+        this.attributePosition = CommonUtils.toInteger(map.get("attributePosition"), null);
        this.orderPosition = map.containsKey("orderPosition") ?
            CommonUtils.toInt(map.get("orderPosition")) + 1 : // Use position + 1 because 0 means no ordering (because of legacy compatibility)
            null;
@@ -64,8 +67,10 @@ public class WebSQLDataFilterConstraint {

    }

-    public static WebSQLDataFilterConstraint from(DBDAttributeConstraint constraint) {
+    @NotNull
+    public static WebSQLDataFilterConstraint from(@NotNull DBDAttributeConstraint constraint) {
        var webConstraint = new WebSQLDataFilterConstraint();
+        webConstraint.attributeName = constraint.getAttributeName();
        webConstraint.orderPosition = constraint.getOrderPosition();
        webConstraint.orderAsc = !constraint.isOrderDescending();
        webConstraint.criteria = constraint.getCriteria();
@@ -76,6 +81,10 @@ public class WebSQLDataFilterConstraint {
        return webConstraint;
    }

+    public String getAttributeName() {
+        return attributeName;
+    }
+
    public Integer getAttributePosition() {
        return attributePosition;
    }
@@ -0,0 +1,23 @@
+/*
+ * 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.service.sql;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+
+public record WebSQLQueryParameterRecord(@NotNull String name, @Nullable String value) {
+}
@@ -21,6 +21,7 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
+import org.jkiss.dbeaver.model.data.DBDDataFilter;
 import org.jkiss.dbeaver.model.data.DBDRowIdentifier;
 import org.jkiss.dbeaver.model.exec.trace.DBCTrace;
 import org.jkiss.dbeaver.model.struct.*;
@@ -42,6 +43,8 @@ public class WebSQLResultsInfo {
    // TODO: find a way to remove isSingleRow and use virtual keys for reading BLOB and string cell values.
    private boolean isSingleRow;
    private DBCTrace trace;
+    @Nullable
+    private DBDDataFilter dataFilter;
    private String queryText;

    public WebSQLResultsInfo(@NotNull DBSDataContainer dataContainer, @NotNull String id) {
@@ -151,4 +154,13 @@ public class WebSQLResultsInfo {
    public void setSingleRow(boolean singleRow) {
        isSingleRow = singleRow;
    }
+
+    @Nullable
+    public DBDDataFilter getDataFilter() {
+        return dataFilter;
+    }
+
+    public void setDataFilter(@Nullable DBDDataFilter dataFilter) {
+        this.dataFilter = dataFilter;
+    }
 }
@@ -18,18 +18,20 @@ package io.cloudbeaver.test;

 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+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.data.json.JSONUtils;
 import org.jkiss.dbeaver.utils.GeneralUtils;
+import org.jkiss.utils.HttpConstants;

+import java.net.CookieManager;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;

 /**
@@ -56,10 +58,13 @@ public class WebGQLClient {
    @NotNull
    private final HttpClient httpClient;
    @NotNull
+    private final CookieManager cookieManager;
+    @NotNull
    private final String apiUrl;

-    public WebGQLClient(@NotNull HttpClient httpClient, @NotNull String apiUrl) {
+    public WebGQLClient(@NotNull HttpClient httpClient, @NotNull CookieManager cookieManager, @NotNull String apiUrl) {
        this.httpClient = httpClient;
+        this.cookieManager = cookieManager;
        this.apiUrl = apiUrl;
    }

@@ -70,9 +75,18 @@ public class WebGQLClient {
     * @param variables GraphQL query variables
     * @return GraphQL response
     */
-    @NotNull
+    @Nullable
    public <T> T sendQuery(@NotNull String query, @Nullable Map<String, Object> variables) throws Exception {
-        return sendQueryWithHeaders(query, variables, List.of());
+        return sendQueryWithHeaders(query, variables, Map.of());
+    }
+
+    @NotNull
+    public Map<String, Object> sendQueryAndGetHeaders(
+        @NotNull String query,
+        @Nullable Map<String, Object> variables,
+        @NotNull Map<String, String> requestHeaders
+    ) throws Exception {
+        return executeGQLRequest(query, variables, requestHeaders);
    }

    /**
@@ -87,15 +101,36 @@ public class WebGQLClient {
    public <T> T sendQueryWithHeaders(
        @NotNull String query,
        @Nullable Map<String, Object> variables,
-        @NotNull List<String> headers
+        @NotNull Map<String, String> headers
+    ) throws Exception {
+        Map<String, Object> parsed = executeGQLRequest(query, variables, headers);
+        // graphql response will be in "data" key
+        return (T) parsed.get("data");
+    }
+
+    @NotNull
+    private Map<String, Object> executeGQLRequest(
+        @NotNull String query,
+        @Nullable Map<String, Object> variables,
+        @NotNull Map<String, String> requestHeaders
+    ) throws Exception {
+        return  executeGQLRequest(query, variables, requestHeaders, "result");
+    }
+
+    @NotNull
+    public Map<String, Object> executeGQLRequest(
+        @NotNull String query,
+        @Nullable Map<String, Object> variables,
+        @NotNull Map<String, String> requestHeaders,
+        @NotNull String resultName
    ) throws Exception {
        HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
            .uri(URI.create(apiUrl))
            .POST(HttpRequest.BodyPublishers.ofString(makeGQLRequest(query, variables)))
            .setHeader("TE-Client-Version", GeneralUtils.getMajorVersion())
-            .header("Content-Type", "application/json");
-        if (!headers.isEmpty()) {
-            requestBuilder.headers(headers.toArray(String[]::new));
+            .header(HttpConstants.HEADER_CONTENT_TYPE, HttpConstants.CONTENT_TYPE_JSON);
+        if (!requestHeaders.isEmpty()) {
+            requestHeaders.forEach(requestBuilder::header);
        }
        HttpRequest request = requestBuilder.build();
        HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
@@ -107,8 +142,10 @@ public class WebGQLClient {
            String message = JSONUtils.getString(JSONUtils.getObjectList(body, "errors").get(0), "message");
            throw new DBException(message);
        }
-        // graphql response will be in "data" key
-        return (T) JSONUtils.getObject(body, "data").get("result");
+        Map<String, Object> parsed = new LinkedHashMap<>();
+        parsed.put("data", JSONUtils.getObject(body, "data").get(resultName));
+        parsed.put("headers", response.headers().map());
+        return parsed;
    }

    @NotNull
@@ -121,4 +158,13 @@ public class WebGQLClient {

        return gson.toJson(request, Map.class);
    }
+
+    @NotNull
+    public String getSessionIdCookie() {
+        return cookieManager.getCookieStore().getCookies().stream()
+            .filter(cookie -> cookie.getName().equals(CBConstants.CB_SESSION_COOKIE_NAME))
+            .findFirst()
+            .get()
+            .getValue();
+    }
 }
@@ -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.
@@ -47,6 +47,8 @@ public class ServletAppUtils {
    private static final String HEADER_REFERER = "Referer";

    private static final String HEADER_FORWARDED_SCHEME = "X-Forwarded-Scheme";
+    private static final String HEADER_FORWARDED_PROTO = "X-Forwarded-Proto";
+    private static final String HEADER_FORWARDED_PORT = "X-Forwarded-Port";
    private static final String HEADER_FORWARDED_HOST = "X-Forwarded-Host";
    private static final Set<Integer> DEFAULT_PORTS = Set.of(
        80,
@@ -191,8 +193,12 @@ public class ServletAppUtils {
        @NotNull String origin
    ) throws DBException {
        String finalOrigin =  webAuthApplication.modifyOrigin(origin);
-        StringBuilder authUriBuilder = new StringBuilder(removeSideSlashes(finalOrigin));
        String serviceUriSegment = removeSideSlashes(webAuthApplication.getAuthServiceUriSegment());
+        String rootUri = removeSideSlashes(getServletApplication().getRootURI());
+        if (finalOrigin.endsWith("/" + rootUri) && serviceUriSegment.startsWith(rootUri + "/")) {
+            finalOrigin = finalOrigin.substring(0, finalOrigin.length() - rootUri.length());
+        }
+        StringBuilder authUriBuilder = new StringBuilder(removeSideSlashes(finalOrigin));
        if (CommonUtils.isNotEmpty(serviceUriSegment)) {
            authUriBuilder.append("/").append(serviceUriSegment);
        }
@@ -294,19 +300,31 @@ public class ServletAppUtils {
    @NotNull
    public static String getOriginFromRequest(@NotNull HttpServletRequest request) {
        String origin = request.getHeader(HEADER_ORIGIN);
+        if (log.isTraceEnabled()) {
+            log.trace("Origin header: " + origin);
+        }
        if (CommonUtils.isEmpty(origin)) {
            origin = request.getHeader(HEADER_X_ORIGIN);
-        }
-        if (CommonUtils.isEmpty(origin)) {
-            origin = request.getHeader(HEADER_REFERER);
+            if (log.isTraceEnabled()) {
+                log.trace("X-Origin header: " + origin);
+            }
        }
        String forwardedScheme = request.getHeader(HEADER_FORWARDED_SCHEME);
+        if (CommonUtils.isEmpty(forwardedScheme)) {
+            forwardedScheme = request.getHeader(HEADER_FORWARDED_PROTO);
+        }
        String forwardedHost = request.getHeader(HEADER_FORWARDED_HOST);
        if (CommonUtils.isNotEmpty(forwardedScheme) && CommonUtils.isNotEmpty(forwardedHost)) {
            origin = forwardedScheme + "://" + forwardedHost;
+            if (log.isTraceEnabled()) {
+                log.trace("forwarded origin: " + origin);
+            }
        }
        if (CommonUtils.isEmpty(origin)) {
            URI requestUrl = URI.create(request.getRequestURL().toString());
+            if (log.isTraceEnabled()) {
+                log.trace("Request URL: " + requestUrl);
+            }
            origin = getRootUrlFromUri(requestUrl) + "/";
        }
        origin = removeSideSlashes(origin);
@@ -318,7 +336,15 @@ public class ServletAppUtils {

        origin = removeSideSlashes(origin);
        URI uri = URI.create(origin);
-        if (DEFAULT_PORTS.contains(uri.getPort())) {
+        int port = uri.getPort();
+        if (CommonUtils.isNotEmpty(request.getHeader(HEADER_FORWARDED_PORT))) {
+            try {
+                port = Integer.parseInt(request.getHeader(HEADER_FORWARDED_PORT));
+            } catch (NumberFormatException e) {
+                log.error("Failed to parse port from header: " + request.getHeader(HEADER_FORWARDED_PORT), e);
+            }
+        }
+        if (DEFAULT_PORTS.contains(port)) {
            try {
                origin = new URI(
                    uri.getScheme(),
@@ -333,6 +359,9 @@ public class ServletAppUtils {
                log.error("Failed to create URI without port", e);
            }
        }
+        if (log.isTraceEnabled()) {
+            log.trace("Origin URI: " + origin);
+        }

        return origin;
    }
@@ -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,13 +16,10 @@
 */
 package io.cloudbeaver.utils;

-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.InstanceCreator;
-import com.google.gson.Strictness;
 import io.cloudbeaver.DBWConstants;
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.WebSessionProjectImpl;
+import io.cloudbeaver.model.WebConnectionConfig;
 import io.cloudbeaver.model.WebConnectionInfo;
 import io.cloudbeaver.model.WebNetworkHandlerConfigInput;
 import io.cloudbeaver.model.session.WebSession;
@@ -30,21 +27,26 @@ 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.DBConstants;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.access.DBAAuthCredentials;
-import org.jkiss.dbeaver.model.access.DBAAuthCredentialsWithComplexProperties;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
+import org.jkiss.dbeaver.model.connection.DBPDataSourceProviderDescriptor;
+import org.jkiss.dbeaver.model.connection.DBPDriver;
+import org.jkiss.dbeaver.model.impl.auth.AuthModelDatabaseNativeCredentials;
 import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
 import org.jkiss.dbeaver.model.net.ssh.SSHConstants;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceDisconnectEvent;
+import org.jkiss.dbeaver.registry.network.NetworkHandlerDescriptor;
+import org.jkiss.dbeaver.registry.network.NetworkHandlerRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
+import org.jkiss.dbeaver.utils.PropertySerializationUtils;
 import org.jkiss.utils.CommonUtils;

-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;

 public class WebDataSourceUtils {

@@ -206,17 +208,193 @@ public class WebDataSourceUtils {
        return webSession.getAccessibleProjectById(projectId).getWebConnectionInfo(connectionId);
    }

-
-    public static void updateCredentialsFromProperties(@NotNull DBAAuthCredentials credentials, @NotNull Map<String, ?> properties) {
-        InstanceCreator<DBAAuthCredentials> credTypeAdapter = type -> credentials;
-        Gson credGson = new GsonBuilder()
-            .setStrictness(Strictness.LENIENT)
-            .registerTypeAdapter(credentials.getClass(), credTypeAdapter)
-            .create();
-
-        if (credentials instanceof DBAAuthCredentialsWithComplexProperties complexProperties) {
-            complexProperties.updateCredentialsFromComplexProperties(properties);
+    public static void updateCredentialsFromProperties(
+        @NotNull DBRProgressMonitor progressMonitor,
+        @NotNull DBAAuthCredentials credentials,
+        @Nullable Map<String, ?> properties
+    ) {
+        if (properties == null) {
+            return;
        }
-        credGson.fromJson(credGson.toJsonTree(properties), credentials.getClass());
+        PropertySerializationUtils.updateCredentialsFromProperties(progressMonitor, credentials, properties);
+    }
+
+    public static void saveAuthProperties(
+        @NotNull DBRProgressMonitor progressMonitor,
+        @NotNull DBPDataSourceContainer dataSourceContainer,
+        @NotNull DBPConnectionConfiguration configuration,
+        @Nullable Map<String, Object> authProperties,
+        boolean saveCredentials,
+        boolean sharedCredentials
+    ) {
+        saveAuthProperties(progressMonitor, dataSourceContainer, configuration, authProperties, saveCredentials, sharedCredentials, false);
+    }
+
+    public static void saveAuthProperties(
+        @NotNull DBRProgressMonitor progressMonitor,
+        @NotNull DBPDataSourceContainer dataSourceContainer,
+        @NotNull DBPConnectionConfiguration configuration,
+        @Nullable Map<String, Object> authProperties,
+        boolean saveCredentials,
+        boolean sharedCredentials,
+        boolean isTest
+    ) {
+        dataSourceContainer.setSavePassword(saveCredentials);
+        dataSourceContainer.setSharedCredentials(sharedCredentials);
+        if (!saveCredentials) {
+            // Reset credentials
+            if (authProperties == null) {
+                authProperties = new LinkedHashMap<>();
+            }
+            authProperties.replace(AuthModelDatabaseNativeCredentials.PROP_USER_PASSWORD, null);
+            dataSourceContainer.resetPassword();
+        } else {
+            if (authProperties == null) {
+                // No changes
+                return;
+            }
+        }
+        {
+            // Read save credentials
+            DBAAuthCredentials credentials = configuration.getAuthModel().loadCredentials(dataSourceContainer, configuration);
+
+            if (isTest) {
+                var currentAuthProps = new HashMap<String, String>();
+                for (Map.Entry<String, Object> stringObjectEntry : authProperties.entrySet()) {
+                    var value = stringObjectEntry.getValue() == null ? null : stringObjectEntry.getValue().toString();
+                    currentAuthProps.put(stringObjectEntry.getKey(), value);
+                }
+                configuration.setAuthProperties(currentAuthProps);
+            }
+            if (!authProperties.isEmpty()) {
+                updateCredentialsFromProperties(progressMonitor, credentials, authProperties);
+            }
+
+            configuration.getAuthModel().saveCredentials(dataSourceContainer, configuration, credentials);
+        }
+    }
+
+    public static void setConnectionConfiguration(
+        @NotNull DBPDriver driver,
+        @NotNull DBPConnectionConfiguration dsConfig,
+        @NotNull WebConnectionConfig config
+    ) {
+        setMainProperties(dsConfig, config);
+        if (config.getProperties() != null) {
+            Map<String, String> newProps = new LinkedHashMap<>();
+            for (Map.Entry<String, Object> pe : config.getProperties().entrySet()) {
+                newProps.put(pe.getKey(), CommonUtils.toString(pe.getValue()));
+            }
+            dsConfig.setProperties(newProps);
+        }
+        if (config.getUserName() != null) {
+            dsConfig.setUserName(config.getUserName());
+        }
+        if (config.getUserPassword() != null) {
+            dsConfig.setUserPassword(config.getUserPassword());
+        }
+        if (config.getAuthModelId() != null) {
+            dsConfig.setAuthModelId(config.getAuthModelId());
+        }
+        if (config.getKeepAliveInterval() >= 0) {
+            dsConfig.setKeepAliveInterval(config.getKeepAliveInterval());
+        }
+        if (config.isDefaultAutoCommit() != null) {
+            dsConfig.getBootstrap().setDefaultAutoCommit(config.isDefaultAutoCommit());
+        }
+        dsConfig.getBootstrap().setDefaultCatalogName(config.getDefaultCatalogName());
+        dsConfig.getBootstrap().setDefaultSchemaName(config.getDefaultSchemaName());
+        // Save provider props
+        if (config.getProviderProperties() != null) {
+            dsConfig.setProviderProperties(new LinkedHashMap<>());
+            for (Map.Entry<String, Object> e : config.getProviderProperties().entrySet()) {
+                dsConfig.setProviderProperty(e.getKey(), CommonUtils.toString(e.getValue()));
+            }
+        }
+        if (config.getConfigurationType() != null) {
+            dsConfig.setConfigurationType(config.getConfigurationType());
+        }
+        if (CommonUtils.isEmpty(config.getUrl())) {
+            dsConfig.setUrl(driver.getConnectionURL(dsConfig));
+        }
+        // Save network handlers
+        if (config.getNetworkHandlersConfig() != null) {
+            for (WebNetworkHandlerConfigInput nhc : config.getNetworkHandlersConfig()) {
+                DBWHandlerConfiguration handlerConfig = dsConfig.getHandler(nhc.getId());
+                if (handlerConfig == null) {
+                    NetworkHandlerDescriptor handlerDescriptor = NetworkHandlerRegistry.getInstance().getDescriptor(nhc.getId());
+                    if (handlerDescriptor == null) {
+                        log.warn("Can't find network handler '" + nhc.getId() + "'");
+                        continue;
+                    } else {
+                        handlerConfig = new DBWHandlerConfiguration(handlerDescriptor, null);
+                        WebDataSourceUtils.updateHandlerConfig(handlerConfig, nhc);
+                    }
+                } else {
+                    WebDataSourceUtils.updateHandlerConfig(handlerConfig, nhc);
+                }
+                dsConfig.updateHandler(handlerConfig);
+            }
+        }
+    }
+
+    public static void setMainProperties(@NotNull DBPConnectionConfiguration dsConfig, @NotNull WebConnectionConfig config) {
+        if (CommonUtils.isNotEmpty(config.getUrl())) {
+            dsConfig.setUrl(config.getUrl());
+            return;
+        }
+        if (config.getMainPropertyValues() != null) {
+            for (Map.Entry<String, Object> e : config.getMainPropertyValues().entrySet()) {
+                if (e.getValue() == null) {
+                    continue;
+                }
+                switch (e.getKey()) {
+                    case DBConstants.PROP_HOST -> dsConfig.setHostName(CommonUtils.toString(e.getValue()));
+                    case DBConstants.PROP_PORT -> dsConfig.setHostPort(CommonUtils.toString(e.getValue()));
+                    case DBConstants.PROP_DATABASE -> dsConfig.setDatabaseName(CommonUtils.toString(e.getValue()));
+                    case DBConstants.PROP_SERVER -> dsConfig.setServerName(CommonUtils.toString(e.getValue()));
+                    default -> throw new IllegalStateException("Unexpected value: " + e.getKey());
+                }
+            }
+            return;
+        }
+        if (config.getHost() != null) {
+            dsConfig.setHostName(config.getHost());
+        }
+        if (config.getPort() != null) {
+            dsConfig.setHostPort(config.getPort());
+        }
+        if (config.getDatabaseName() != null) {
+            dsConfig.setDatabaseName(config.getDatabaseName());
+        }
+        if (config.getServerName() != null) {
+            dsConfig.setServerName(config.getServerName());
+        }
+    }
+
+    @NotNull
+    public static DBPDriver getDriverById(String id) throws DBWebException {
+        int divPos = id.indexOf(':');
+        if (divPos < 0) {
+            throw new DBWebException("Bad driver id [" + id + "]");
+        }
+        String dsId = id.substring(0, divPos);
+        String driverId = id.substring(divPos + 1);
+        DBPDataSourceProviderDescriptor dsProvider = DBWorkbench.getPlatform().getDataSourceProviderRegistry().getDataSourceProvider(dsId);
+        if (dsProvider == null) {
+            throw new DBWebException("Data source provider '" + dsId + "' not found");
+        }
+        DBPDriver driver = dsProvider.getDriver(driverId);
+        if (driver == null) {
+            throw new DBWebException("Driver '" + driverId + "' not found in provider '" + dsId + "'");
+        }
+        return driver;
+    }
+
+    public static String getConnectionContainerInfo(@Nullable DBPDataSourceContainer container) {
+        if (container == null) {
+            return null;
+        }
+        return container.getName() + " [" + container.getId() + "]";
    }
 }
@@ -18,6 +18,7 @@ package io.cloudbeaver.utils;

 import io.cloudbeaver.model.WebAsyncTaskInfo;
 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.websocket.event.task.WSSessionTaskInfoEvent;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.app.DBPProject;
@@ -30,7 +31,6 @@ import org.jkiss.dbeaver.model.websocket.event.datasource.WSDatasourceFolderEven
 import org.jkiss.dbeaver.model.websocket.event.permissions.WSSubjectPermissionEvent;
 import org.jkiss.dbeaver.model.websocket.event.resource.WSResourceProperty;
 import org.jkiss.dbeaver.model.websocket.event.resource.WSResourceUpdatedEvent;
-import org.jkiss.dbeaver.model.websocket.event.session.WSSessionTaskInfoEvent;

 import java.util.List;

@@ -0,0 +1,42 @@
+package io.cloudbeaver.utils;
+
+import io.cloudbeaver.model.rm.local.RMProjectName;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.app.DBPProject;
+import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.rm.RMProjectType;
+import org.jkiss.utils.CommonUtils;
+
+public class WebRMUtils {
+
+    public static RMProject createRmProjectFromWebProject(@NotNull DBPProject project) {
+        RMProject rmProject = new RMProject();
+        rmProject.setId(project.getId());
+        rmProject.setName(project.getName());
+        rmProject.setDescription(project.getDescription());
+        rmProject.setType(parseProjectNameUnsafe(rmProject.getId()).getType());
+        return rmProject;
+    }
+
+    public static RMProjectName parseProjectName(@NotNull String projectId) throws DBException {
+        if (CommonUtils.isEmpty(projectId)) {
+            throw new DBException("Project id is empty");
+        }
+        return parseProjectNameUnsafe(projectId);
+    }
+
+    public static RMProjectName parseProjectNameUnsafe(String projectId) {
+        String prefix;
+        String name;
+        int divPos = projectId.indexOf("_");
+        if (divPos < 0) {
+            prefix = RMProjectType.USER.getPrefix();
+            name = projectId;
+        } else {
+            prefix = projectId.substring(0, divPos);
+            name = projectId.substring(divPos + 1);
+        }
+        return new RMProjectName(prefix, name);
+    }
+}
@@ -17,8 +17,11 @@

 package io.cloudbeaver.utils;

+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.utils.GeneralUtils;

+import java.lang.reflect.Field;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -39,4 +42,30 @@ public class WebTestUtils {
            return false;
        }
    }
+
+    public static void setPrivateField(
+        @NotNull Object target,
+        @NotNull String fieldName,
+        @Nullable Object value
+    ) throws Exception {
+        Class<?> cls = target.getClass();
+        Field f = null;
+        while (cls != null) {
+            Field[] fields = cls.getDeclaredFields();
+            for (Field field : fields) {
+                if (field.getName().equals(fieldName)) {
+                    f = field;
+                    break;
+                }
+            }
+            cls = cls.getSuperclass();
+        }
+        if (f == null) {
+            throw new NoSuchFieldException(fieldName);
+        }
+        boolean isAccessible = f.canAccess(target);
+        f.setAccessible(true);
+        f.set(target, value);
+        f.setAccessible(isAccessible);
+    }
 }
@@ -0,0 +1,53 @@
+/*
+ * 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.websocket;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.websocket.WSConstants;
+import org.jkiss.dbeaver.model.websocket.event.session.WSAbstractSessionEvent;
+
+public class WSServerNotificationEvent extends WSAbstractSessionEvent {
+
+    public static final String EVENT_ID = "cb_server_notification";
+    private String title;
+    private String message;
+    private WSServerNotificationEventType notificationType;
+
+    public WSServerNotificationEvent(
+        @Nullable String title,
+        @Nullable String message,
+        @NotNull WSServerNotificationEventType notificationType
+    ) {
+        super(EVENT_ID, WSConstants.TOPIC_USER_NOTIFICATION);
+        this.title = title;
+        this.message = message;
+        this.notificationType = notificationType;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public WSServerNotificationEventType getNotificationType() {
+        return notificationType;
+    }
+}
--- a/Show More
+++ b/Show More