dbeaver/cloudbeaver#4249 added session rotation (#4274 ) (#4331 )

* dbeaver/cloudbeaver#4249 added session rotation (#4274) * dbeaver/cloudbeaver#4249 added session rotation * dbeaver/pro#4249 update web session id * dbeaver/pro#4249 remove log * dbeaver/pro#4249 remove unused params * dbeaver/pro#4249 revert non-related changes * dbeaver/cloudbeaver#4249 rotate session before login * dbeaver/cloudbeaver#4249 fix code style * dbeaver/cloudbeaver#4249 rotate only for anon users * dbeaver/cloudbeaver#4249 added notnulls --------- Co-authored-by: Evgenia <139753579+EvgeniaBzzz@users.noreply.github.com> * dbeaver/pro#4249 fix websocket for session rotation --------- Co-authored-by: Dmitrii Barnukov <29237913+Nexus6v2@users.noreply.github.com> Co-authored-by: Evgenia <139753579+EvgeniaBzzz@users.noreply.github.com> Co-authored-by: Ruslan <pupkinvasya7000@gmail.com>
dbeaver/pro#9700 Save RM datasources correctly
2026-10-16 14:50:15 +08:00 · 2026-06-25 07:06:38 +02:00 · 2026-06-24 17:48:29 +02:00 · 2026-06-24 15:29:07 +02:00 · 2026-06-24 12:54:46 +02:00 · 2026-06-24 05:01:41 +02:00
3079 changed files with 67285 additions and 41894 deletions
@@ -46,24 +46,17 @@ jobs:
      - run: corepack enable
      - uses: actions/setup-node@v4
        with:
-          node-version: "lts/*"
+          node-version: "24.13.1"
          cache: "yarn"
          cache-dependency-path: |
-            cloudbeaver/common-*/yarn.lock
            cloudbeaver/webapp/yarn.lock

-      - name: restore cloudbeaver-common typescript cache
-        uses: actions/cache@v4
-        with:
-          path: "cloudbeaver/common-*/**/*/lib"
-          key: ${{ runner.os }}-common-dist-${{ hashFiles('cloudbeaver/common-*/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-common-dist-
-
      - name: restore typescript cache
        uses: actions/cache@v4
        with:
-          path: "cloudbeaver/webapp/**/packages/*/dist"
+          path: |
+            "cloudbeaver/webapp/common-*/**/*/lib"
+            "cloudbeaver/webapp/**/packages/*/dist"
          key: ${{ runner.os }}-dist-${{ hashFiles('cloudbeaver/webapp/yarn.lock') }}
          restore-keys: |
            ${{ runner.os }}-dist-
@@ -71,23 +64,11 @@ jobs:
      - if: inputs.clean-cache
        run: yarn clear

-      - run: yarn install --immutable
-        working-directory: ./cloudbeaver/common-typescript
-
-      - run: yarn install --immutable
-        working-directory: ./cloudbeaver/common-react
-
      - run: yarn install --immutable

      - run: yarn bundle
        working-directory: ./cloudbeaver/webapp/packages/product-default

-      - run: yarn test
-        working-directory: ./cloudbeaver/common-typescript
-
-      - run: yarn test
-        working-directory: ./cloudbeaver/common-react
-
      - run: yarn test

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

      # - run: yarn install --immutable
-      #   working-directory: ./cloudbeaver/common-typescript
+      #   working-directory: ./cloudbeaver/webapp/common-typescript

      # - run: yarn install --immutable
-      #   working-directory: ./cloudbeaver/common-react
+      #   working-directory: ./cloudbeaver/webapp/common-react

      - run: |
          yarn install --immutable
@@ -6,6 +6,7 @@ on:
      - opened
      - synchronize
      - reopened
+      - ready_for_review
  push:
    branches: [devel]

@@ -24,11 +25,6 @@ jobs:
      project-deps: ./cloudbeaver/project.deps
      timeout-minutes: 5

-  # build-server:
-  #   name: Server
-  #   uses: ./.github/workflows/backend-build.yml
-  #   secrets: inherit
-
  build-frontend:
    name: Frontend
    uses: ./.github/workflows/frontend-build.yml
@@ -38,6 +34,9 @@ jobs:
    name: Server
    uses: dbeaver/dbeaver-common/.github/workflows/java-checkstyle.yml@devel
    secrets: inherit
+    permissions:
+      contents: read
+      pull-requests: read

  lint-frontend:
    name: Frontend
@@ -14,8 +14,7 @@
    "redhat.vscode-yaml",
    "streetsidesoftware.code-spell-checker",
    "streetsidesoftware.code-spell-checker-russian",
-    "syler.sass-indented",
-    "VisualStudioExptTeam.vscodeintellicode",
+    "github.copilot-chat",
    "yzhang.markdown-all-in-one",
    "GraphQL.vscode-graphql-syntax",
    "mrmlnc.vscode-json5",
@@ -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",
@@ -26,7 +26,7 @@
      "group": "test",
      "args": ["test"],
      "options": {
-        "cwd": "${workspaceFolder}/common-typescript"
+        "cwd": "${workspaceFolder}/webapp/common-typescript"
      }
    },
    {
@@ -36,7 +36,7 @@
      "group": "test",
      "args": ["test"],
      "options": {
-        "cwd": "${workspaceFolder}/common-react"
+        "cwd": "${workspaceFolder}/webapp/common-react"
      }
    },
    {
@@ -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"
@@ -133,9 +133,18 @@
      "type": "shell",
      "command": "yarn",
      "options": {
-        "cwd": "${workspaceFolder}/common-react/@dbeaver/ui-kit"
+        "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": [
@@ -2,6 +2,6 @@
 <?pde version="3.8"?>
 <target name="org.jkiss.cloudbeaver.tp">
 	<locations>
-		<location path="../../dbeaver-workspace/dependencies/plugins" type="Directory"/>
+		<location path="../../../dbeaver-workspace/dependencies/plugins" type="Directory"/>
 	</locations>
-</target>
+</target>
@@ -1,6 +1,6 @@
 {
  "name": "vscode-java-configs",
-  "packageManager": "yarn@4.9.2",
+  "packageManager": "yarn@4.14.1",
  "devDependencies": {
    "typescript": "^5.8.3"
  }
@@ -1,17 +1,20 @@
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" align="right" width="250"/>
+<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" alt="CloudBeaver logo" align="right" width="250"/>

 # CloudBeaver Community

 Cloud Database Manager - Community Edition.  
 CloudBeaver is a web server that provides a rich web interface. The server itself is a Java application, and the web part is written in TypeScript and React.  
 It is free to use and open-source (licensed under [Apache 2](https://github.com/dbeaver/cloudbeaver/blob/devel/LICENSE) license).  
-See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details. 

 <a><img src="https://github.com/dbeaver/cloudbeaver/wiki/images/connection-creation-demo.png" width="400"/></a>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/gis-demo.png" width="400"/>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/data-transfer-demo.png" width="400"/>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/sql-editor-demo.png" width="400"/>

+## Documentation
+- [GitHub WIKI](https://github.com/dbeaver/cloudbeaver/wiki)
+- [Official documentation](https://dbeaver.com/docs/cloudbeaver/)
+
 ## Run in Docker

 - [Official Docker repository](https://hub.docker.com/r/dbeaver/cloudbeaver)
@@ -19,67 +22,100 @@ See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.

 ## Demo server

-You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io  
+You can see a live demo of CloudBeaver server here: https://demo.cloudbeaver.io  

 [Database access instructions](https://github.com/dbeaver/cloudbeaver/wiki/Demo-Server)

 ## Changelog

-### 25.1.4 2025-08-04
- Added an ability to review the script before execution when users edit tables without primary keys in the Data Editor;
- DuckDB: driver has been updated to version 1.3.2;
- Databend: driver has been updated to version 0.3.9.
+### 26.1.1 2026-06-22

-### 25.1.3 2025-07-21
- A password confirmation field has been added for administrators in the Easy Config section to help prevent accidental misconfigurations;
- Added column descriptions in the Data Editor to provide more metadata context. You can disable this in Preferences > Data Editor;
- Added the option to display tabs across multiple rows, allowing you to see all tabs without scrolling. You can enable this in Preferences > Interface;
- 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;
- Clickhouse: fixed the presentation of tuples and map data types in the data editor.
+### Changes since 26.1.0:

-### 25.1.2 2025-07-07
- The CloudBeaver default theme matches the device theme by default now. You can change this behavior in user preferences under the Theme section;
- Added a button “Clear” to the Output panel;
- Changed the data transfer mechanism to avoid intermediate file creation. The parameter dataExportFileSizeLimit was removed from the server configuration as deprecated;
- PostgresSQL: fixed misplaced comment for table DDL generation.
+- General: Added a "Project Info" tab containing the project description to the project context menu.
+- Security:
+	- Fixed a cross-site scripting vulnerability caused by unsanitized user input in the web interface.
+	- Resolved a security flaw related to user-controlled file paths by adding strict validation to prevent unauthorized resource access.
+	- Fixed the critical vulnerability (CVE-2026-9277) in the shell-quote library (updated to version 1.8.4).

-### 25.1.1 2025-06-23
-### Changes since 25.1.0:
- Added a search panel for SQL Editor and Value panel: press Ctrl+F to open a panel that allows searching and replacing by keyword or regular expression.
- Added a new welcome screen for a freshly opened application. This screen contains shortcuts to create a new connection, open SQL editor or documentation.
- Databend database support has been added.
+### 26.1.0 2026-06-01
+
+### Changes since 26.0.0:

-### 25.1.0 2025-06-02
-### Changes since 25.0.0:
- Important:
-  -    Connection templates were removed from the application. You can use the Connection Editor to create new connections.
 - Administration:
-  -    Log records now capture create, update, and delete actions for users, teams, and connections for improved tracking and transparency.
- LDAP authorization:
-  -    Added support for secure [LDAP authentication over SSL](https://github.com/dbeaver/cloudbeaver/wiki/LDAP-Authentication);
-  -    Brute force protection is now supported for LDAP authentication. All authentication methods on the application level have this security mechanism.
+    - Added support for custom startup arguments when running CloudBeaver in a container. Administrators can specify configuration file locations to adapt the application to their environment. (thanks to @MalteHei)
+    - Updated the manifest.webmanifest file to generate dynamically based on the CLOUDBEAVER_ROOT_URI environment variable. (thanks to @houssemexo26)
+- Authorization:
+    - Added HTTP header authentication support for GraphQL queries. Users can provide API tokens via Authorization or X-Api-Key headers, allowing external data tools to authenticate without modifying request bodies.
+    - Fixed a bug in the authentication form: the existing password is now required for password changes.
 - SQL Editor:
-  -    A new setting to autosave scripts in the SQL editor appeared in global and users' preferences;
-  -    Auto-completion has been improved for aliases and camelCase entities.
+    - Updated the SQL Editor to use real tab characters for indentation. The application displayed tabs as four-space gaps with a distinct visual marker.
+    - Added an ability to view and edit scripts without connecting to the database.
+    - Added the ability to open generated queries right from the Generate SQL window.
+    - Added fuzzy search to SQL Editor auto-completion for object names. The feature allows users to find tables and containers even with typos or incorrect letter ordering.
+    - Added the tooltip about quoting rules for the Bind variables parameters dialog.
+    - Fixed keyword autocompletion for partially typed keywords to avoid redundant letters.
 - Data Editor:
-  -    Improved table rendering to scale column width depending on the content;
-  -    Accessibility: improved keyboard navigation by sorting buttons in column headers.
+    - Added the ability to copy-paste multiple cells at once. Pasted values will be distributed across selected cells.
+    - Added an ability to add, duplicate, delete, or set values to NULL in multiple highlighted rows via the Data Editor context menu.
+    - Added the Find and Replace functionality for the Data Editor with the ability to find data by matching case, whole word, or using regular expressions.
+    - Data Editor started to keep the state of column configurations, such as filters, sorting, and ordering, after the reconnect, page refresh, and re-login.
+    - Added key column mark for tables with unique keys in the data grid.
+    - Added more settings to the Generated SQL window, including the ability to select fully qualified names for query or use compact SQL formatting.
+    - Added a DDL generation option to the Data Editor and Result Set context menu.
+    - Fixed copy and paste behavior for multiline and special characters in the Data Editor. Added visual glyphs to indicate line breaks and tabs in the data grid.
+    - Fixed the ability to copy Boolean values in the clipboard in the Data Editor.
+    - Fixed the ability to calculate row count for non-standard SELECT statements. (thanks to @fdcastel)
+- Navigator tree:
+    - Reorganized the context menu on the connection level to make it more compact.
+    - Added support for special symbols (pipe, comma, and asterisk) for the search field.
+    - Removed the "Folders" setting from the settings list for the Navigator Tree.
+- Accessibility:
+    - Added the Skip to content option for quick keyboard access to the Navigator Tree, editors, and shortcuts list tab to improve application accessibility.
+    - Improved keyboard navigation for context menu and buttons for Data Editor, SQL Editor, and Navigator tree.
+    - Added the Ctrl + / keyboard shortcut to open the context menu for selected cells in the Data Editor.
+    - Fixed the ability to switch tabs in the Data Editor using the keyboard.
+    - Fixed contrast for elements across different application parts in the light and dark themes to meet WCAG requirements.
 - General:
-  -    Added the ability to configure the default database or schema in the connection configuration;
-  -    Enhanced initial configuration stage security: a server needs to be restarted if the initial setup time exceeds 1 hour;
-  -    Improved Navigation tree performance: lost connection does not lead to the application freezing anymore;
-  -    Data transfer: Improved export/import functionality performance by optimizing disk memory consumption;
-  -    Vietnamese localization has been added (thanks to [0xhanh](https://github.com/0xhanh)).
+    - Marked icons for non-saved (temporary) scripts with the hourglass symbol to add visual distinction from the saved ones.
+    - Added the ability to set to NULL any value in the Driver Properties.
+    - Fixed custom driver properties display for the connection page.
+    - Fixed data export in SQL format for values containing single quotes.
 - Databases and drivers:
-  -    Clickhouse: driver has been updated to version 0.8.5;
-  -    DuckDB: expanded the list of system objects that can be hidden in the Navigation tree;
-  -    LibSQL: added the ability to connect using token authentication;
-  -    Oracle: users' DDL in Oracle is displayed in the metadata editor on the corresponding tab for users with Oracle administration permissions;
-  -    SQLite: added information about a table's Strict mode to the table metadata section (thanks to [eusebe-cda](https://github.com/eusebe-cda)).
-
-## Contribution
-As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 
-
-[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.1.0 was made by:
-1. [0xhanh](https://github.com/0xhanh) - for Vietnamese localization.
+    - ClickHouse:
+        - Fixed the display of Array(JSON) types in the data grid.
+        - Updated driver version to 0.9.7.
+        - Fixed IP address display in the Data Editor by removing the leading slash.
+    - Added support for the "prompt=false" connection property for DB2 for IBM i to turn off interactive prompts and prevent related errors.
+    - DuckDB:
+        - Fixed map rendering for GEOMETRY types with CRS parameters.
+        - Fixed geometry type display for database versions > 1.5.
+    - H2 database:
+        - Added new embedded driver version 2.4.2.
+        - Updated server driver to version 2.4.2.
+    - Firebird: Expanded database-specific SQL dialect coverage for the SQL Editor. Added more keywords, built-in functions, and SQL generators.
+    - MySQL: Fixed query boundaries recognition in the SQL Editor for scripts with the DELIMITER keyword.
+    - PostgreSQL:
+        - Updated driver to version 42.7.11
+        - Fixed missing INOUT parameters in CHECK generation for procedures and functions.
+        - Fixed handling of 24:xx values in time columns.
+        - Fixed an error when connecting via URL if the database name contains a hyphen.
+    - SQL Server:
+        - Fixed DDL generation for external tables.
+        - Fixed the database connectivity issue after the Java update.
+- Security:
+    - Added an administrative setting to restrict SSH tunneling capabilities. Administrators can now limit tunnel configuration to authorized users, reducing the risk of unauthorized network access.
+    - Fixed the critical vulnerability (CVE-2025-62718) in the axios library. The library was updated to version 1.15.0.
+    - Fixed the high vulnerability (CVE-2026-4800) in the lodash library. The library was updated to version 4.18.0.
+    - Fixed the high vulnerability (CVE-2026-39363) in the vite library. The library was updated to version 7.3.2.
+    - Fixed the high vulnerability (CVE-2026-42035) in the axios library. The library was updated to version 1.15.1.
+    - Fixed the high vulnerability (CVE-2026-3505) in the bcpg-jdk18on library. The library was updated to version 1.84.0.
+    - Fixed the high vulnerability (CVE-2026-33671) in the picomatch library. The library was updated to version 2.3.2.
+    - Fixed the high vulnerability (CVE-2026-33943) in the happy-dom library. The library was updated to version 20.8.8.
+    - Fixed the high vulnerability (CVE-2025-45141) in the tar library. The library was updated to version 7.5.11.
+    - Fixed the high vulnerability (CVE-2026-27148) in the storybook library. The library was updated to version 10.2.10.
+    - Fixed the high vulnerability (CVE-2026-27606) in the rollup library. The library was updated to version 4.59.0.
+    - Fixed the high vulnerability (CVE-2026-27904) in the minimatch library. The library was updated to version 3.1.3.
+    - Fixed the high vulnerability (CVE-2026-27959) in the koa library. The library was updated to version 2.16.4.
+    - Fixed the high vulnerability (CVE-2026-32141) in the flatted library. The library was updated to version 4.4.0.
+    - Fixed the medium vulnerability (CVE-2026-41305) in the postcss library. The library was updated to version 8.5.14.
@@ -1,18 +1,6 @@
 # Security Policy

-## Supported Versions
-
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
-
-| Version | Supported |
-| ------- | --------- |
-| 22.x    | yes       |
-| 23.x    | yes       |
-| 24.x    | yes       |
-
 ## Reporting a Vulnerability

-Please report (suspected) security vulnerabilities to devops@dbeaver.com.
-You will receive a response from us within 48 hours.
+Please report (suspected) security vulnerabilities to <security@dbeaver.com>.
 If the issue is confirmed, we will release a patch as soon as possible, depending on complexity, but historically, within a few days.
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>io.cloudbeaver</groupId>
+    <artifactId>config-generator</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.13.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <mainClass>io.cloudbeaver.ConfigGenerator</mainClass>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-external-config</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/config</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.basedir}/../../config/template</directory>
+                                    <includes>
+                                        <include>cloudbeaver-base.conf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -0,0 +1,235 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2026 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import com.google.gson.*;
+import com.google.gson.reflect.TypeToken;
+
+import java.io.Reader;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+
+public class ConfigGenerator {
+
+    private static final Gson gson = new GsonBuilder()
+        .setPrettyPrinting()
+        .disableHtmlEscaping()
+        .create();
+    private static final String EMPTY_STRING = "''";
+
+
+    public static void main(String[] args) throws Exception {
+        String baseConfigPath = System.getProperty("config.base");
+        if (baseConfigPath == null || baseConfigPath.isEmpty()) {
+            URL resource = ConfigGenerator.class.getClassLoader().getResource("config/cloudbeaver-base.conf");
+            if (resource == null) {
+                System.out.println("Base config path is required");
+                return;
+            }
+            baseConfigPath = resource.toURI().getPath();
+            if (System.getProperty("os.name").toLowerCase().contains("win")) {
+                // Fix for Windows in dev mode. Resource URI starts with / (e.g. /C:/some/folder)
+                // And this breaks Java NIO
+                if (baseConfigPath.startsWith("/")) {
+                    baseConfigPath = baseConfigPath.substring(1);
+                }
+            }
+        }
+        String outputPath = System.getProperty("config.output");
+        if (outputPath == null || outputPath.isEmpty()) {
+            System.out.println("Output config path is required");
+            return;
+        }
+
+        String configPatches = System.getProperty("config.patches");
+
+        List<String> overrideConfigs = configPatches == null ? List.of() : Arrays.asList(configPatches.split(","));
+
+        Map<String, Object> config = readConfigurationFile(baseConfigPath);
+        System.out.println("Base config loaded");
+
+        for (String overrideConfig : overrideConfigs) {
+            if (Files.exists(Path.of(overrideConfig))) {
+                System.out.println("Applying override config: " + overrideConfig);
+            } else {
+                System.out.println("Override config not found, skipping: " + overrideConfig);
+                continue;
+            }
+            System.out.println("Processing override config: " + overrideConfig);
+            Map<String, Object> overrideConfigMap = readConfigurationFile(overrideConfig);
+            System.out.println("Override config loaded: " + overrideConfig);
+            applyProductConfig(config, overrideConfigMap);
+            System.out.println("Override config applied: " + overrideConfig);
+        }
+
+        Map<String, Object> finalMap = convertToOutputFormat(config);
+        System.out.println("Config converted to output format");
+
+        writeConfigurationFile(finalMap, outputPath);
+        System.out.println("Config written to: " + outputPath);
+    }
+
+    private static Map<String, Object> readConfigurationFile(String filePath) throws Exception {
+        Path path = Path.of(filePath);
+        if (!Files.exists(path)) {
+            throw new IllegalArgumentException("Configuration file not found: " + filePath);
+        }
+
+        try (Reader reader = Files.newBufferedReader(path)) {
+            return gson.fromJson(reader, TypeToken.getParameterized(Map.class, String.class, Object.class).getType());
+        }
+    }
+
+    private static void applyProductConfig(Map<String, Object> baseConfig, Map<String, Object> productConfig) {
+        if (productConfig.containsKey("add")) {
+            Map<String, Object> add = (Map<String, Object>) productConfig.get("add");
+            deepMergeMap(baseConfig, add);
+        }
+
+        if (productConfig.containsKey("remove")) {
+            Map<String, Object> remove = (Map<String, Object>) productConfig.get("remove");
+            deepRemoveMap(baseConfig, remove);
+        }
+    }
+
+    private static void deepMergeMap(Map<String, Object> target, Map<String, Object> source) {
+        for (Map.Entry<String, Object> entry : source.entrySet()) {
+            Object sourceValue = entry.getValue();
+            Object targetValue = target.get(entry.getKey());
+
+            if (sourceValue instanceof Map && targetValue instanceof Map) {
+                deepMergeMap((Map<String, Object>) targetValue, (Map<String, Object>) sourceValue);
+            } else {
+                target.put(entry.getKey(), sourceValue);
+            }
+        }
+    }
+
+    private static void deepRemoveMap(Map<String, Object> target, Map<String, Object> source) {
+        for (Map.Entry<String, Object> entry : source.entrySet()) {
+            Object sourceValue = entry.getValue();
+            Object targetValue = target.get(entry.getKey());
+
+            if (sourceValue instanceof Map && targetValue instanceof Map) {
+                deepRemoveMap((Map<String, Object>) targetValue, (Map<String, Object>) sourceValue);
+            } else {
+                target.remove(entry.getKey());
+            }
+        }
+    }
+
+    private static void writeConfigurationFile(Map<String, Object> map, String filePath) throws Exception {
+        JsonElement tree = gson.toJsonTree(map);
+        StringBuilder sb = new StringBuilder();
+        writeElement(tree, sb, 0);
+        Files.write(Path.of(filePath), sb.toString().getBytes());
+    }
+
+    private static void writeElement(JsonElement elem, StringBuilder sb, int count) {
+        String indent = "    ";
+        if (elem.isJsonObject()) {
+            sb.append("{\n");
+            JsonObject obj = elem.getAsJsonObject();
+            var iterator = obj.entrySet().iterator();
+
+            while (iterator.hasNext()) {
+                var entry = iterator.next();
+                sb.repeat(indent, count + 1).append(entry.getKey()).append(": ");
+                writeElement(entry.getValue(), sb, count + 1);
+                if (iterator.hasNext()) {
+                    sb.append(",");
+                }
+                sb.append("\n");
+            }
+            sb.repeat(indent, count).append("}");
+
+        } else if (elem.isJsonArray()) {
+            sb.append("[\n");
+            JsonArray array = elem.getAsJsonArray();
+            for (int i = 0; i < array.size(); i++) {
+                sb.repeat(indent, count + 1);
+                writeElement(array.get(i), sb, count + 1);
+                if (i < array.size() - 1) {
+                    sb.append(",");
+                }
+                sb.append("\n");
+            }
+            sb.repeat(indent, count).append("]");
+
+        } else {
+            String valueStr = gson.toJson(elem).replace("\n", "\n" + indent);
+            sb.append(valueStr);
+        }
+    }
+
+    private static Map<String, Object> convertToOutputFormat(Map<String, Object> map) {
+        Map<String, Object> result = new LinkedHashMap<>();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            result.put(entry.getKey(), convertValue(entry.getValue()));
+        }
+        return result;
+    }
+
+    private static Object convertValue(Object value) {
+        if (value instanceof Map) {
+            Map<String, Object> map = (Map<String, Object>) value;
+            if (!map.isEmpty() && map.containsKey("value")) {
+                if (map.containsKey("env")) {
+                    String env = (String) map.get("env");
+                    Object defValue = map.get("value");
+                    return "${" + env + ":" + formatDefaultValue(defValue) + "}";
+                } else {
+                    return convertValue(map.get("value"));
+                }
+            }
+            Map<String, Object> result = new LinkedHashMap<>();
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                result.put(entry.getKey(), convertValue(entry.getValue()));
+            }
+            return result;
+        } else if (value instanceof List) {
+            List<Object> list = (List<Object>) value;
+            List<Object> result = new ArrayList<>();
+            for (Object item : list) {
+                result.add(convertValue(item));
+            }
+            return result;
+        }
+        return value;
+    }
+
+    private static String formatDefaultValue(Object value) {
+        return switch (value) {
+            case null -> EMPTY_STRING;
+            case String str -> str.isEmpty() ? EMPTY_STRING : str;
+            case Boolean b -> value.toString();
+            case Number number -> {
+                if (number instanceof Double || number instanceof Float) {
+                    long longVal = number.longValue();
+                    if (longVal == number.doubleValue()) {
+                        yield String.valueOf(longVal);
+                    }
+                }
+                yield number.toString();
+            }
+            // TODO: handle list elements if needed
+            default -> value.toString();
+        };
+    }
+}
@@ -1,9 +0,0 @@
-{
-  "search.exclude": {
-    "**/.yarn": true,
-    "**/.pnp.*": true
-  },
-  "typescript.tsdk": ".yarn/sdks/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true,
-  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs"
-}
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/bin/prettier.cjs
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real prettier/bin/prettier.cjs your application uses
-module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real prettier your application uses
-module.exports = wrapWithUserWrapper(absRequire(`prettier`));
@@ -1,7 +0,0 @@
-{
-  "name": "prettier",
-  "version": "3.6.2-sdk",
-  "main": "./index.cjs",
-  "type": "commonjs",
-  "bin": "./bin/prettier.cjs"
-}
@@ -1 +0,0 @@
-!lib
@@ -1,16 +0,0 @@
-import { Row, type RenderRowProps } from 'react-data-grid';
-import { DataGridRowContext } from './DataGridRowContext.js';
-import { memo, use, useEffect } from 'react';
-import { useGridReactiveValue } from './useGridReactiveValue.js';
-
-export const BaseRow = memo(function BaseRow<TRow, TSummaryRow>(props: RenderRowProps<TRow, TSummaryRow>) {
-  const rowContext = use(DataGridRowContext);
-  const rowsCount = useGridReactiveValue(rowContext?.onScrollToBottom ? rowContext?.rowCount : undefined);
-
-  useEffect(() => {
-    if (rowsCount === props.rowIdx + 1) {
-      rowContext?.onScrollToBottom?.();
-    }
-  }, [rowsCount]);
-  return <Row {...props} />;
-}) as <TRow, TSummaryRow>(props: RenderRowProps<TRow, TSummaryRow>) => React.ReactNode;
@@ -1,181 +0,0 @@
-import { forwardRef, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { DataGrid as DataGridBase, type ColumnOrColumnGroup, type CellSelectArgs, type DataGridHandle, type ColumnWidth, type ColumnWidths } from 'react-data-grid';
-import { rowRenderer } from './renderers/rowRenderer.js';
-import { cellRenderer } from './renderers/cellRenderer.js';
-import { DataGridCellHeaderContext, type IDataGridHeaderCellContext } from './DataGridHeaderCellContext.js';
-import { DataGridCellContext, type IDataGridCellContext } from './DataGridCellContext.js';
-import type { IInnerRow } from './IInnerRow.js';
-import type { IGridReactiveValue } from './IGridReactiveValue.js';
-import { useGridReactiveValue } from './useGridReactiveValue.js';
-import { mapCellContentRenderer } from './mapCellContentRenderer.js';
-import { mapRenderHeaderCell } from './mapRenderHeaderCell.js';
-import { mapEditCellRenderer } from './mapEditCellRenderer.js';
-import { DataGridRowContext, type IDataGridRowContext } from './DataGridRowContext.js';
-import './DataGrid.css';
-import { HeaderDnDContext, useHeaderDnD } from './useHeaderDnD.js';
-
-export interface ICellPosition {
-  rowIdx: number;
-  colIdx: number;
-}
-
-export interface DataGridCellKeyboardEvent extends React.KeyboardEvent<HTMLDivElement> {
-  preventGridDefault: () => void;
-  isGridDefaultPrevented: () => boolean;
-}
-
-export interface DataGridProps extends IDataGridCellContext, IDataGridRowContext, IDataGridHeaderCellContext, React.PropsWithChildren {
-  getRowHeight?: (rowIdx: number) => number;
-  getRowId?: (rowIdx: number) => React.Key;
-  columnCount: IGridReactiveValue<number, []>;
-  getColumnKey?: (colIdx: number) => string;
-  onScroll?: (event: React.UIEvent<HTMLDivElement>) => void;
-  onFocus?: (position: ICellPosition) => void;
-  onEditorOpen?: (position: ICellPosition) => void;
-  onCellKeyDown?: (position: ICellPosition, event: DataGridCellKeyboardEvent) => void;
-  className?: string;
-}
-
-export interface DataGridRef {
-  selectCell: (position: ICellPosition) => void;
-  scrollToCell: (position: Partial<ICellPosition>) => void;
-  openEditor: (position: ICellPosition) => void;
-}
-
-export const DataGrid = forwardRef<DataGridRef, DataGridProps>(function DataGrid(
-  {
-    headerElement,
-    getHeaderWidth,
-    headerText,
-    getHeaderOrder,
-    getHeaderResizable,
-    columnSortable,
-    getHeaderHeight,
-    getHeaderPinned,
-    columnSortingState,
-    getHeaderDnD,
-    cell,
-    cellText,
-    cellElement,
-    cellTooltip,
-    getCellEditable,
-    columnCount,
-    getColumnKey,
-    rowCount,
-    getRowId,
-    getRowHeight,
-    onHeaderReorder,
-    onScroll,
-    onScrollToBottom,
-    onFocus,
-    onCellChange,
-    onColumnSort,
-    onHeaderKeyDown,
-    children,
-    className,
-    onCellKeyDown,
-  },
-  ref,
-) {
-  const [columnWidths, setColumnWidths] = useState<ColumnWidths>(() => new Map<string, ColumnWidth>());
-  const rowsCount = useGridReactiveValue(rowCount);
-  const columnsCount = useGridReactiveValue(columnCount);
-
-  const rowsCountRef = useRef(rowsCount);
-  const innerGridRef = useRef<DataGridHandle>(null);
-  const columns = new Array<ColumnOrColumnGroup<IInnerRow, unknown>>(columnsCount)
-    .fill(null as any)
-    .map((_, i): ColumnOrColumnGroup<IInnerRow, unknown> => {
-      const width = getHeaderWidth?.(i) ?? 'max-content';
-      return {
-        key: getColumnKey?.(i) ?? String(i),
-        name: '',
-        resizable: getHeaderResizable?.(i) ?? true,
-        width,
-        minWidth: 26,
-        editable: row => getCellEditable?.(row.idx, i) ?? false,
-        frozen: getHeaderPinned?.(i),
-        renderHeaderCell: mapRenderHeaderCell(i),
-        renderCell: mapCellContentRenderer(i),
-        renderEditCell: mapEditCellRenderer(i),
-      };
-    });
-
-  const dndHeaderContext = useHeaderDnD({ columns, onReorder: onHeaderReorder, getCanDrag: getHeaderDnD, getHeaderOrder });
-
-  useImperativeHandle(ref, () => ({
-    selectCell: (position: ICellPosition) => {
-      innerGridRef.current?.selectCell({ idx: dndHeaderContext.getDataColIdx(position.colIdx), rowIdx: position.rowIdx });
-    },
-    scrollToCell: (position: Partial<ICellPosition>) => {
-      innerGridRef.current?.scrollToCell({ idx: position.colIdx && dndHeaderContext.getDataColIdx(position.colIdx), rowIdx: position.rowIdx });
-    },
-    openEditor: (position: ICellPosition) => {
-      innerGridRef.current?.selectCell({ idx: dndHeaderContext.getDataColIdx(position.colIdx), rowIdx: position.rowIdx }, {
-        enableEditor: true,
-      });
-    },
-  }));
-
-  if (rowsCountRef.current !== rowsCount) {
-    const previousRowCount = rowsCountRef.current;
-    rowsCountRef.current = rowsCount;
-
-    if (previousRowCount === 0) {
-      setColumnWidths(new Map<string, ColumnWidth>());
-    }
-  }
-
-  let rows = useMemo(
-    () =>
-      new Array<IInnerRow>(rowsCount).fill({ idx: 0 }).map((_, i) => ({
-        idx: i,
-      })),
-    [rowsCount],
-  );
-
-  function handleCellFocus(args: CellSelectArgs<IInnerRow, unknown>) {
-    onFocus?.({ colIdx: dndHeaderContext.getDataColIdx(args.column.idx), rowIdx: args.rowIdx });
-  }
-
-  function handleCellKeyDown(args: CellSelectArgs<IInnerRow, unknown>, event: DataGridCellKeyboardEvent) {
-    onCellKeyDown?.({ colIdx: dndHeaderContext.getDataColIdx(args.column.idx), rowIdx: args.rowIdx }, event);
-  }
-
-  const isMeasurementRender = columnWidths.size === 0 && columnCount.get() > 0;
-
-  if (isMeasurementRender) {
-    rows = rows.slice(0, 100);
-  }
-
-  return (
-    <HeaderDnDContext value={dndHeaderContext}>
-      <DataGridRowContext value={{ rowCount, onScrollToBottom }}>
-        <DataGridCellContext value={{ cell, cellText, cellElement, cellTooltip, onCellChange }}>
-          <DataGridCellHeaderContext value={{ headerElement, headerText, getHeaderDnD, columnSortable, onColumnSort, columnSortingState, onHeaderKeyDown }}>
-            <DataGridBase
-              ref={innerGridRef}
-              columns={dndHeaderContext.columns}
-              enableVirtualization={!isMeasurementRender}
-              rows={rows}
-              className={className}
-              headerRowHeight={getHeaderHeight?.()}
-              rowHeight={getRowHeight ? row => getRowHeight(row.idx) : undefined}
-              rowKeyGetter={getRowId ? row => getRowId(row.idx) : undefined}
-              columnWidths={columnWidths}
-              renderers={{
-                renderRow: rowRenderer,
-                renderCell: cellRenderer,
-                noRowsFallback: children,
-              }}
-              onScroll={onScroll}
-              onSelectedCellChange={handleCellFocus}
-              onCellKeyDown={handleCellKeyDown}
-              onColumnWidthsChange={setColumnWidths}
-            />
-          </DataGridCellHeaderContext>
-        </DataGridCellContext>
-      </DataGridRowContext>
-    </HeaderDnDContext>
-  );
-});
@@ -1,7 +0,0 @@
-import { createContext } from 'react';
-
-export interface IDataGridCellInnerContext {
-  isFocused: boolean;
-}
-
-export const DataGridCellInnerContext = createContext<IDataGridCellInnerContext | null>(null);
@@ -1,9 +0,0 @@
-import { createContext } from 'react';
-import type { IGridReactiveValue } from './IGridReactiveValue.js';
-
-export interface IDataGridRowContext {
-  rowCount: IGridReactiveValue<number, []>;
-  onScrollToBottom?: () => void;
-}
-
-export const DataGridRowContext = createContext<IDataGridRowContext | null>(null);
@@ -1,14 +0,0 @@
-import { clsx } from '@dbeaver/ui-kit';
-
-interface Props {
-  className?: string;
-  onClick?: React.MouseEventHandler<HTMLElement>;
-}
-
-export function NullFormatter({ className, onClick }: Props) {
-  return (
-    <span className={clsx('tw:uppercase', 'tw:opacity-65', className)} onClick={onClick}>
-      [NULL]
-    </span>
-  );
-}
@@ -1,11 +0,0 @@
-export function reorderArray<T>(array: T[], from: number, to: number): T[] {
-  const newArray = [...array];
-  if (from < to) {
-    newArray.splice(to, 0, array[from]!);
-    newArray.splice(from, 1);
-  } else {
-    newArray.splice(from, 1);
-    newArray.splice(to, 0, array[from]!);
-  }
-  return newArray;
-}
@@ -1,44 +0,0 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0.
- * you may not use this file except in compliance with the License.
- */
-import './index.css';
-
-/* AriaKit Utility Components */
-export {
-  VisuallyHidden,
-  FocusTrap,
-  type FocusTrapOptions,
-  type FocusTrapProps,
-  Focusable,
-  type FocusableOptions,
-  type FocusableProps,
-  FocusTrapRegion,
-  type FocusTrapRegionOptions,
-  type FocusTrapRegionProps,
-} from '@ariakit/react';
-
-export { Button, ButtonBase, type ButtonProps, ButtonIcon, type ButtonIconProps } from './Button/Button.js';
-export { IconButton, IconButtonBase, type IconButtonProps } from './IconButton/IconButton.js';
-export { Checkbox, CheckboxBase, type CheckboxProps } from './Checkbox/Checkbox.js';
-export { Input, InputBase, type InputProps } from './Input/Input.js';
-export {
-  Select,
-  useSelectContext,
-  useSelectStore,
-  type SelectProviderProps,
-  type SelectProps,
-  type SelectLabelProps,
-  type SelectPopoverProps,
-  type SelectItemProps,
-} from './Select/Select.js';
-export * from './Combobox/Combobox.js';
-export { SelectField, type SelectFieldProps, type SelectItem } from './Select/SelectField.js';
-export { Spinner, type SpinnerProps } from './Spinner/Spinner.js';
-export { Radio, RadioGroup, useRadioContext, useRadioStore, type RadioProviderProps, type RadioProps, type RadioGroupProps } from './Radio/index.js';
-export { Icon, type IconProps } from './Icon/Icon.js';
-export * from './utils/clsx.js';
-export * from './ComponentProvider.js';
@@ -1,9 +0,0 @@
-{
-  "search.exclude": {
-    "**/.yarn": true,
-    "**/.pnp.*": true
-  },
-  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
-  "typescript.tsdk": ".yarn/sdks/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true
-}
@@ -1,5 +0,0 @@
-# This file is automatically generated by @yarnpkg/sdks.
-# Manual changes might be lost!
-
-integrations:
-  - vscode
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/bin/prettier.cjs
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real prettier/bin/prettier.cjs your application uses
-module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real prettier your application uses
-module.exports = wrapWithUserWrapper(absRequire(`prettier`));
@@ -1,7 +0,0 @@
-{
-  "name": "prettier",
-  "version": "3.6.2-sdk",
-  "main": "./index.cjs",
-  "type": "commonjs",
-  "bin": "./bin/prettier.cjs"
-}
@@ -1,3 +0,0 @@
-export * from './isDefined.js';
-export * from './isNotNullDefined.js';
-export * from './mutex.js';
@@ -1,99 +0,0 @@
-{
-    server: {
-        serverPort: "${CLOUDBEAVER_WEB_SERVER_PORT:8978}",
-        forceHttps: "${CLOUDBEAVER_FORCE_HTTPS:false}",
-
-        contentRoot: "web",
-        driversLocation: "drivers",
-
-        sslConfigurationPath:"${CLOUDBEAVER_SSL_CONF_PATH:workspace/.data/ssl-config.xml}",
-
-        rootURI: "${CLOUDBEAVER_ROOT_URI:/}",
-        serviceURI: "/api/",
-        supportedHosts: [],
-
-        productSettings: {
-            # Global properties
-            core.theming.theme: "${CLOUDBEAVER_CORE_THEMING_THEME:system}",
-            core.localization.language: "${CLOUDBEAVER_CORE_LOCALIZATION:en}",
-            plugin.sql-editor.autoSave: "${CLOUDBEAVER_SQL_EDITOR_AUTOSAVE:true}",
-            plugin.sql-editor.disabled: "${CLOUDBEAVER_SQL_EDITOR_DISABLED:false}",
-            # max size of the file that can be uploaded to the editor (in kilobytes)
-            plugin.sql-editor.maxFileSize: "${CLOUDBEAVER_SQL_EDITOR_MAX_FILE_SIZE:10240}",
-            plugin.log-viewer.disabled: "${CLOUDBEAVER_LOG_VIEWER_DISABLED:false}",
-            plugin.log-viewer.logBatchSize: "${CLOUDBEAVER_LOG_VIEWER_LOG_BATCH_SIZE:1000}",
-            plugin.log-viewer.maxLogRecords: "${CLOUDBEAVER_LOG_VIEWER_MAX_LOG_RECORDS:2000}",
-            sql.proposals.insert.table.alias: "${CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS:PLAIN}",
-            SQLEditor.ContentAssistant.experimental.mode: "${CLOUDBEAVER_SQL_EDITOR_CONTENT_ASSISTANT_EXPERIMENTAL_MODE:NEW}"
-        },
-
-        expireSessionAfterPeriod: "${CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD:1800000}",
-        bindSessionToIp: "${CLOUDBEAVER_BIND_SESSION_TO_IP:disable}",
-        develMode: "${CLOUDBEAVER_DEVEL_MODE:false}",
-
-        enableSecurityManager: false,
-
-        sm: {
-            enableBruteForceProtection: "${CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED:true}",
-            maxFailedLogin: "${CLOUDBEAVER_MAX_FAILED_LOGINS:10}",
-            minimumLoginTimeout: "${CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT:1}",
-            blockLoginPeriod: "${CLOUDBEAVER_BLOCK_PERIOD:300}",
-            passwordPolicy: {
-                minLength: "${CLOUDBEAVER_POLICY_MIN_LENGTH:8}",
-                requireMixedCase: "${CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE:true}",
-                minNumberCount: "${CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT:1}",
-                minSymbolCount: "${CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT:0}"
-            }
-        },
-
-        database: {
-            driver: "${CLOUDBEAVER_DB_DRIVER:h2_embedded_v2}",
-            url: "${CLOUDBEAVER_DB_URL:jdbc:h2:${workspace}/.data/cb.h2v2.dat}",
-            schema: "${CLOUDBEAVER_DB_SCHEMA:''}",
-            user: "${CLOUDBEAVER_DB_USER:''}",
-            password: "${CLOUDBEAVER_DB_PASSWORD:''}",
-            initialDataConfiguration: "${CLOUDBEAVER_DB_INITIAL_DATA:conf/initial-data.conf}",
-            pool: {
-                minIdleConnections: "${CLOUDBEAVER_DB_MIN_IDLE_CONNECTIONS:4}",
-                maxIdleConnections: "${CLOUDBEAVER_DB_MAX_IDLE_CONNECTIONS:10}",
-                maxConnections: "${CLOUDBEAVER_DB_MAX_CONNECTIONS:100}",
-                validationQuery: "${CLOUDBEAVER_DB_VALIDATION_QUERY:SELECT 1}"
-            },
-            backupEnabled: "${CLOUDBEAVER_DB_BACKUP_ENABLED:true}"
-        }
-
-    },
-    app: {
-        anonymousAccessEnabled: "${CLOUDBEAVER_APP_ANONYMOUS_ACCESS_ENABLED:true}",
-        anonymousUserRole: user,
-        defaultUserTeam: "${CLOUDBEAVER_APP_DEFAULT_USER_TEAM:user}",
-        grantConnectionsAccessToAnonymousTeam: "${CLOUDBEAVER_APP_GRANT_CONNECTIONS_ACCESS_TO_ANONYMOUS_TEAM:false}",
-        supportsCustomConnections: "${CLOUDBEAVER_APP_SUPPORTS_CUSTOM_CONNECTIONS:false}",
-        showReadOnlyConnectionInfo: "${CLOUDBEAVER_APP_READ_ONLY_CONNECTION_INFO:false}",
-        systemVariablesResolvingEnabled: "${CLOUDBEAVER_SYSTEM_VARIABLES_RESOLVING_ENABLED:false}",
-
-        forwardProxy: "${CLOUDBEAVER_APP_FORWARD_PROXY:false}",
-
-        publicCredentialsSaveEnabled: "${CLOUDBEAVER_APP_PUBLIC_CREDENTIALS_SAVE_ENABLED:true}",
-        adminCredentialsSaveEnabled: "${CLOUDBEAVER_APP_ADMIN_CREDENTIALS_SAVE_ENABLED:true}",
-
-        resourceManagerEnabled: "${CLOUDBEAVER_APP_RESOURCE_MANAGER_ENABLED:true}",
-
-        resourceQuotas: {
-            resourceManagerFileSizeLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_RESOURCE_MANAGER_FILE_SIZE_LIMIT:500000}",
-            sqlMaxRunningQueries: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_MAX_RUNNING_QUERIES:100}",
-            sqlResultSetRowsLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_RESULT_SET_ROWS_LIMIT:100000}",
-            sqlTextPreviewMaxLength: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_TEXT_PREVIEW_MAX_LENGTH:4096}",
-            sqlBinaryPreviewMaxLength: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_BINARY_PREVIEW_MAX_LENGTH:261120}"
-        },
-        enabledAuthProviders: [
-            "local"
-        ],
-
-        disabledBetaFeatures: [
-
-        ]
-
-    }
-
-}
@@ -0,0 +1,271 @@
+{
+    server: {
+        serverPort: {
+            env: "CLOUDBEAVER_WEB_SERVER_PORT",
+            value: 8978
+        },
+
+        forceHttps: {
+            env: "CLOUDBEAVER_FORCE_HTTPS",
+            value: false
+        },
+
+        contentRoot: {
+            env: "CLOUDBEAVER_CONTENT_ROOT",
+            value: "web"
+        },
+
+        driversLocation: {
+            env: "CLOUDBEAVER_DRIVERS_LOCATION",
+            value: "drivers"
+        },
+
+        sslConfigurationPath: {
+            env: "CLOUDBEAVER_SSL_CONF_PATH",
+            value: "workspace/.data/ssl-config.xml"
+        },
+
+        rootURI: {
+            env: "CLOUDBEAVER_ROOT_URI",
+            value: "/"
+        },
+
+        serviceURI: {
+            env: "CLOUDBEAVER_SERVICE_URI",
+            value: "/api/"
+        },
+
+        supportedHosts: [],
+
+        productSettings: {
+            core.theming.theme: {
+                env: "CLOUDBEAVER_CORE_THEMING_THEME",
+                value: "system"
+            },
+            core.localization.language: {
+                env: "CLOUDBEAVER_CORE_LOCALIZATION",
+                value: "en"
+            },
+            plugin.sql-editor.autoSave: {
+                env: "CLOUDBEAVER_SQL_EDITOR_AUTOSAVE",
+                value: true
+            },
+            plugin.sql-editor.disabled: {
+                env: "CLOUDBEAVER_SQL_EDITOR_DISABLED",
+                value: false
+            },
+            plugin.sql-editor.maxFileSize: {
+                env: "CLOUDBEAVER_SQL_EDITOR_MAX_FILE_SIZE",
+                value: 10240
+            },
+            plugin.log-viewer.disabled: {
+                env: "CLOUDBEAVER_LOG_VIEWER_DISABLED",
+                value: false
+            },
+            plugin.log-viewer.logBatchSize: {
+                env: "CLOUDBEAVER_LOG_VIEWER_LOG_BATCH_SIZE",
+                value: 1000
+            },
+            plugin.log-viewer.maxLogRecords: {
+                env: "CLOUDBEAVER_LOG_VIEWER_MAX_LOG_RECORDS",
+                value: 2000
+            },
+            sql.proposals.insert.table.alias: {
+                env: "CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS",
+                value: "PLAIN"
+            },
+            SQLEditor.ContentAssistant.experimental.mode: {
+                env: "CLOUDBEAVER_SQL_EDITOR_CONTENT_ASSISTANT_EXPERIMENTAL_MODE",
+                value: "NEW"
+            }
+        },
+
+        expireSessionAfterPeriod: {
+            env: "CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD",
+            value: 1800000
+        },
+
+        bindSessionToIp: {
+            env: "CLOUDBEAVER_BIND_SESSION_TO_IP",
+            value: "disable"
+        },
+
+        develMode: {
+            env: "CLOUDBEAVER_DEVEL_MODE",
+            value: false
+        },
+
+        sm: {
+            enableBruteForceProtection: {
+                env: "CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED",
+                value: true
+            },
+            maxFailedLogin: {
+                env: "CLOUDBEAVER_MAX_FAILED_LOGINS",
+                value: 10
+            },
+            minimumLoginTimeout: {
+                env: "CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT",
+                value: 1
+            },
+            blockLoginPeriod: {
+                env: "CLOUDBEAVER_BLOCK_PERIOD",
+                value: 300
+            },
+
+            passwordPolicy: {
+                minLength: {
+                    env: "CLOUDBEAVER_POLICY_MIN_LENGTH",
+                    value: 8
+                },
+                requireMixedCase: {
+                    env: "CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE",
+                    value: true
+                },
+                minNumberCount: {
+                    env: "CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT",
+                    value: 1
+                },
+                minSymbolCount: {
+                    env: "CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT",
+                    value: 0
+                }
+            }
+        },
+
+        database: {
+            driver: {
+                env: "CLOUDBEAVER_DB_DRIVER",
+                value: "h2_embedded_v2"
+            },
+            url: {
+                env: "CLOUDBEAVER_DB_URL",
+                value: "jdbc:h2:${workspace}/.data/cb.h2v2.dat"
+            },
+            schema: {
+                env: "CLOUDBEAVER_DB_SCHEMA",
+                value: ""
+            },
+            user: {
+                env: "CLOUDBEAVER_DB_USER",
+                value: ""
+            },
+            password: {
+                env: "CLOUDBEAVER_DB_PASSWORD",
+                value: ""
+            },
+            initialDataConfiguration: {
+                env: "CLOUDBEAVER_DB_INITIAL_DATA",
+                value: "conf/initial-data.conf"
+            },
+
+            pool: {
+                minIdleConnections: {
+                    env: "CLOUDBEAVER_DB_MIN_IDLE_CONNECTIONS",
+                    value: 4
+                },
+                maxIdleConnections: {
+                    env: "CLOUDBEAVER_DB_MAX_IDLE_CONNECTIONS",
+                    value: 10
+                },
+                maxConnections: {
+                    env: "CLOUDBEAVER_DB_MAX_CONNECTIONS",
+                    value: 100
+                },
+                validationQuery: {
+                    env: "CLOUDBEAVER_DB_VALIDATION_QUERY",
+                    value: "SELECT 1"
+                }
+            },
+
+            backupEnabled: {
+                env: "CLOUDBEAVER_DB_BACKUP_ENABLED",
+                value: true
+            }
+        }
+    },
+
+    app: {
+        anonymousAccessEnabled: {
+            env: "CLOUDBEAVER_APP_ANONYMOUS_ACCESS_ENABLED",
+            value: true
+        },
+
+        anonymousUserRole: {
+            env: "CLOUDBEAVER_APP_ANONYMOUS_USER_ROLE",
+            value: "user"
+        },
+
+        defaultUserTeam: {
+            env: "CLOUDBEAVER_APP_DEFAULT_USER_TEAM",
+            value: "user"
+        },
+
+        grantConnectionsAccessToAnonymousTeam: {
+            env: "CLOUDBEAVER_APP_GRANT_CONNECTIONS_ACCESS_TO_ANONYMOUS_TEAM",
+            value: false
+        },
+
+        supportsCustomConnections: {
+            env: "CLOUDBEAVER_APP_SUPPORTS_CUSTOM_CONNECTIONS",
+            value: false
+        },
+
+        showReadOnlyConnectionInfo: {
+            env: "CLOUDBEAVER_APP_READ_ONLY_CONNECTION_INFO",
+            value: false
+        },
+
+        systemVariablesResolvingEnabled: {
+            env: "CLOUDBEAVER_SYSTEM_VARIABLES_RESOLVING_ENABLED",
+            value: false
+        },
+
+        forwardProxy: {
+            env: "CLOUDBEAVER_APP_FORWARD_PROXY",
+            value: false
+        },
+
+        publicCredentialsSaveEnabled: {
+            env: "CLOUDBEAVER_APP_PUBLIC_CREDENTIALS_SAVE_ENABLED",
+            value: true
+        },
+
+        adminCredentialsSaveEnabled: {
+            env: "CLOUDBEAVER_APP_ADMIN_CREDENTIALS_SAVE_ENABLED",
+            value: true
+        },
+
+        resourceManagerEnabled: {
+            env: "CLOUDBEAVER_APP_RESOURCE_MANAGER_ENABLED",
+            value: true
+        },
+
+        resourceQuotas: {
+            resourceManagerFileSizeLimit: {
+                env: "CLOUDBEAVER_RESOURCE_QUOTA_RESOURCE_MANAGER_FILE_SIZE_LIMIT",
+                value: 500000
+            },
+            sqlMaxRunningQueries: {
+                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_MAX_RUNNING_QUERIES",
+                value: 100
+            },
+            sqlResultSetRowsLimit: {
+                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_RESULT_SET_ROWS_LIMIT",
+                value: 100000
+            },
+            sqlTextPreviewMaxLength: {
+                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_TEXT_PREVIEW_MAX_LENGTH",
+                value: 4096
+            },
+            sqlBinaryPreviewMaxLength: {
+                env: "CLOUDBEAVER_RESOURCE_QUOTA_SQL_BINARY_PREVIEW_MAX_LENGTH",
+                value: 261120
+            }
+        },
+
+        enabledAuthProviders: ["local"],
+
+        disabledBetaFeatures: []
+    }
+}
@@ -18,7 +18,6 @@ cd ../..
 echo "Pull dbeaver platform"
 [ ! -d dbeaver ] && git clone --depth 1 https://github.com/dbeaver/dbeaver.git
 [ ! -d dbeaver-common ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-common.git
-[ ! -d dbeaver-jdbc-libsql ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-jdbc-libsql.git


 cd cloudbeaver/deploy
@@ -32,6 +31,9 @@ if [[ "$?" -ne 0 ]] ; then
 fi
 cd ../../../deploy

+echo "Generate cloudbeaver.conf file"
+mvn -f ../apps/config-generator compile exec:java -Dconfig.output="cloudbeaver/conf/cloudbeaver.conf"
+
 echo "Copy server packages"

 cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server
@@ -5,12 +5,8 @@ echo "Build static content"

 mkdir -p ./cloudbeaver/web

-cd ../../cloudbeaver/common-typescript
+cd ../../cloudbeaver/webapp

-yarn install --immutable
-cd ../common-react
-yarn install --immutable
-cd ../webapp
 yarn install --immutable
 cd ./packages/product-default
 yarn run bundle
@@ -19,11 +15,7 @@ if [[ "$?" -ne 0 ]] ; then
  echo 'Application build failed'; exit $rc
 fi

-cd ../../../common-typescript
-yarn test
-cd ../common-react
-yarn test
-cd ../webapp
+cd ../../
 yarn test

 if [[ "$?" -ne 0 ]] ; then
@@ -36,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."
@@ -20,7 +20,6 @@ echo Pull dbeaver platform

 IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
 IF NOT EXIST dbeaver-common git clone https://github.com/dbeaver/dbeaver-common.git
-IF NOT EXIST dbeaver-jdbc-libsql git clone https://github.com/dbeaver/dbeaver-jdbc-libsql.git

 cd cloudbeaver\deploy

@@ -43,6 +42,9 @@ copy ..\config\DefaultConfiguration\GlobalConfiguration\.dbeaver\data-sources.js

 move drivers cloudbeaver >NUL

+echo Generate cloudbeaver.conf file
+call mvn -f ..\apps\config-generator compile exec:java -Dconfig.output="cloudbeaver\conf\cloudbeaver.conf" || goto :error
+
 echo "Build static content"

 mkdir .\cloudbeaver\web
@@ -72,6 +74,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
@@ -1,4 +1,5 @@
-FROM ubuntu:24.04
+# Ubuntu 24.04 (Noble Numbat)
+FROM ubuntu:noble

 MAINTAINER DBeaver Corp, devops@dbeaver.com

@@ -31,7 +32,7 @@ RUN set -eux; \
 ENV LANG=en_US.UTF-8

 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:25-jdk-noble $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"

 RUN set -eux; \
@@ -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
@@ -1,3 +1,2 @@
 dbeaver-common
-dbeaver-jdbc-libsql
 dbeaver
@@ -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.13.qualifier
+Bundle-Release-Date: 20260706
+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.13-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.CmdProcessResult;
+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 CmdProcessResult 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 CmdProcessResult(CmdProcessResult.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.83.qualifier
-Bundle-Release-Date: 20250818
+Bundle-Version: 1.0.104.qualifier
+Bundle-Release-Date: 20260706
 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,
@@ -10,4 +10,10 @@ meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.deploymentType.n
 meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbUrl.name=Security manager database URL
 meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbDriverName.name=Security manager database driver name
 meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductName.name=Security manager database product name
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductVersion.name=Security manager database product version
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductVersion.name=Security manager database product version
+
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Read-only connection
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Auto-commit
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Keep-alive interval (seconds)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Default schema
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Default catalog
@@ -0,0 +1,2 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Garder actif (en secondes)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = Pas de déconnexion automatique
@@ -0,0 +1,5 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Только для чтения
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Авто-коммит
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Интервал Keep-alive (в секундах)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Схема по умолчанию
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Каталог по умолчанию
@@ -0,0 +1,4 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Kết nối chỉ đọc
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Tự động commit
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Giữ kết nối (tính bằng giây)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = Không tự động ngắt kết nối
@@ -0,0 +1,3 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = 自动提交
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = 保持连接 (秒)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = 无自动断开连接
@@ -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.83-SNAPSHOT</version>
+    <version>1.0.104-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;
+    }
+
+
+}
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package io.cloudbeaver;

 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.utils.WebEventUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBPEvent;
@@ -36,7 +37,7 @@ public class WebDataSourceConnectEventListener implements DBPEventListener {
    }

    @Override
-    public void handleDataSourceEvent(DBPEvent event) {
+    public void handleDataSourceEvent(@NotNull DBPEvent event) {
        if (!(event.getObject() instanceof DBPDataSourceContainer container)) {
            return;
        }
@@ -46,7 +47,7 @@ public class WebDataSourceConnectEventListener implements DBPEventListener {
                new WSDataSourceConnectEvent(
                    container.getProject().getId(),
                    container.getId(),
-                    webSession.getSessionId(),
+                    WebEventUtils.getSmSessionId(webSession),
                    webSession.getUserId()
                )
            );
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2026 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,11 +30,13 @@ import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.net.DBWNetworkProfile;
+import org.jkiss.dbeaver.model.net.DBWNetworkProfileManager;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
 import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
 import org.jkiss.dbeaver.registry.DataSourceConfigurationManager;
+import org.jkiss.dbeaver.registry.DataSourceParseResults;
 import org.jkiss.dbeaver.registry.DataSourcePersistentRegistry;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;

@@ -257,28 +259,12 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
        dataSourceRegistry.removeSavedFilter(filterName);
    }

-    @Nullable
-    @Override
-    public DBWNetworkProfile getNetworkProfile(@Nullable String source, @NotNull String name) {
-        return dataSourceRegistry.getNetworkProfile(source, name);
-    }
-
    @NotNull
    @Override
-    public List<DBWNetworkProfile> getNetworkProfiles() {
+    public DBWNetworkProfileManager getNetworkProfiles() {
        return dataSourceRegistry.getNetworkProfiles();
    }

-    @Override
-    public void updateNetworkProfile(@NotNull DBWNetworkProfile profile) {
-        dataSourceRegistry.updateNetworkProfile(profile);
-    }
-
-    @Override
-    public void removeNetworkProfile(@NotNull DBWNetworkProfile profile) {
-        dataSourceRegistry.removeNetworkProfile(profile);
-    }
-
    @Nullable
    @Override
    public DBAAuthProfile getAuthProfile(@NotNull String id) {
@@ -377,7 +363,13 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
    }

    @Override
-    public boolean loadDataSources(
+    public void initializeDataSources() {
+        dataSourceRegistry.initializeDataSources();
+    }
+
+    @NotNull
+    @Override
+    public DataSourceParseResults loadDataSources(
        @NotNull List<DBPDataSourceConfigurationStorage> storages,
        @NotNull DataSourceConfigurationManager manager,
        @Nullable Collection<String> dataSourceIds, boolean refresh,
@@ -391,6 +383,7 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
        dataSourceRegistry.saveDataSources();
    }

+    @NotNull
    @Override
    public DataSourceConfigurationManager getConfigurationManager() {
        return dataSourceRegistry.getConfigurationManager();
@@ -406,12 +399,12 @@ public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, Dat
    }

    @Override
-    public void persistSecrets(DBSSecretController secretController) throws DBException {
+    public void persistSecrets(@NotNull DBSSecretController secretController) throws DBException {
        dataSourceRegistry.persistSecrets(secretController);
    }

    @Override
-    public void resolveSecrets(DBSSecretController secretController) throws DBException {
+    public void resolveSecrets(@NotNull DBSSecretController secretController) throws DBException {
        dataSourceRegistry.resolveSecrets(secretController);
    }

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

 import java.util.Set;
@@ -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,52 +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.auth.SMObjectType;
 import org.jkiss.dbeaver.model.navigator.DBNModel;
 import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.rm.RMUtils;
+import org.jkiss.dbeaver.model.security.SMControllerUtils;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;
+import org.jkiss.dbeaver.registry.project.BaseProjectSettings;
 import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
+import org.jkiss.utils.CommonUtils;

 import java.nio.file.Path;
 import java.util.*;
-import java.util.stream.Collectors;

-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(),
@@ -69,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
@@ -80,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() {
@@ -156,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);
        }
@@ -181,6 +218,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
     *
     * @return connections from cache.
     */
+    @NotNull
    public List<WebConnectionInfo> getConnections() {
        if (!registryIsLoaded) {
            addDataSourcesToCache();
@@ -194,43 +232,34 @@ public class WebSessionProjectImpl extends WebProjectImpl {
    /**
     * updates data sources based on event in web session
     *
-     * @param dataSourceIds list of updated connections
-     * @param eventId  id of event
+     * @param event data source updated event
     */
-    public synchronized boolean updateProjectDataSources(@NotNull List<String> dataSourceIds, @NotNull String eventId) {
+    public synchronized boolean updateProjectDataSources(@NotNull WSDataSourceEvent event) {
        var sendDataSourceUpdatedEvent = false;
        DBPDataSourceRegistry registry = getDataSourceRegistry();
-        // save old connections
-        var oldDataSources = dataSourceIds.stream()
-            .map(registry::getDataSource)
-            .filter(Objects::nonNull)
-            .collect(Collectors.toMap(
-                DBPDataSourceContainer::getId,
-                registry::createDataSource)
-            );
-        if (WSDataSourceEvent.CREATED.equals(eventId) || WSDataSourceEvent.UPDATED.equals(eventId)) {
-            registry.refreshConfig(dataSourceIds);
+        if (WSDataSourceEvent.CREATED.equals(event.getId()) || WSDataSourceEvent.UPDATED.equals(event.getId())) {
+            registry.refreshConfig(event.getDataSourceIds());
        }
-        for (String dsId : dataSourceIds) {
+        for (String dsId : event.getDataSourceIds()) {
            DataSourceDescriptor ds = (DataSourceDescriptor) registry.getDataSource(dsId);
            if (ds == null) {
                continue;
            }
-            switch (eventId) {
+            switch (event.getId()) {
                case WSDataSourceEvent.CREATED -> {
                    addConnection(ds);
                    sendDataSourceUpdatedEvent = true;
                }
                case WSDataSourceEvent.UPDATED ->  {
-                    boolean connectionUpdated = !ds.equalSettings(oldDataSources.get(dsId));
-                    if (connectionUpdated) {
+                    if (event.getProperty() == WSDataSourceProperty.CONFIGURATION) {
+                        WebDataSourceUtils.disconnectDataSource(webSession, ds, true);
+                    }
+                    if (event.getProperty() != WSDataSourceProperty.INTERNAL) {
                        sendDataSourceUpdatedEvent = true;
-                        WebDataSourceUtils.disconnectDataSource(webSession, ds);
                    }
-                    // if settings were changed we need to send event
                }
                case WSDataSourceEvent.DELETED -> {
-                    WebDataSourceUtils.disconnectDataSource(webSession, ds);
+                    WebDataSourceUtils.disconnectDataSource(webSession, ds, false);
                    if (registry instanceof DBPDataSourceRegistryCache dsrc) {
                        dsrc.removeDataSourceFromList(ds);
                    }
@@ -243,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, false);
+        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,61 +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 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");
-            readOnly = JSONUtils.getBoolean(params, "readOnly");
+    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");

-            keepAliveInterval = JSONUtils.getInteger(params, "keepAliveInterval", -1);
-            defaultAutoCommit = JSONUtils.getBoolean(params, "autocommit", true);
+        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");
+        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
+        );

-            mainPropertyValues = JSONUtils.getObjectOrNull(params, "mainPropertyValues");
-            providerProperties = JSONUtils.getObjectOrNull(params, "providerProperties");
-            defaultCatalogName = JSONUtils.getString(params, "defaultCatalogName");
-            defaultSchemaName = JSONUtils.getString(params, "defaultSchemaName");
+        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);
-
-            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));
        }
    }

@@ -116,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
@@ -219,33 +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 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;
@@ -37,12 +39,15 @@ import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
 import org.jkiss.dbeaver.model.impl.auth.AuthModelDatabaseNative;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.navigator.DBNBrowseSettings;
-import org.jkiss.dbeaver.model.navigator.DBNDataSource;
+import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
+import org.jkiss.dbeaver.model.navigator.DBNUtils;
+import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
 import org.jkiss.dbeaver.model.rm.RMConstants;
 import org.jkiss.dbeaver.model.rm.RMProjectPermission;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableParametrized;
+import org.jkiss.dbeaver.registry.DataSourcePreferenceStore;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerDescriptor;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -58,7 +63,6 @@ import java.util.stream.Collectors;
 public class WebConnectionInfo {

    private static final Log log = Log.getLog(WebConnectionInfo.class);
-    public static final String SECURED_VALUE = "********";

    private static final String FEATURE_HAS_TOOLS = "hasTools";
    private static final String FEATURE_CONNECTED = "connected";
@@ -126,7 +130,7 @@ public class WebConnectionInfo {
        if (canViewReadOnlyConnections()) {
            return dataSourceContainer.getConnectionConfiguration().getHostName();
        }
-        return SECURED_VALUE;
+        return CBConstants.SECURED_VALUE;
    }

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

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

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

    @Property
@@ -210,7 +214,8 @@ public class WebConnectionInfo {

    @Property
    public String getNodePath() {
-        return DBNDataSource.makeDataSourceItemPath(dataSourceContainer);
+        DBNDatabaseNode dsNode = DBNUtils.getNodeByObject(dataSourceContainer);
+        return dsNode == null ? null : dsNode.getNodeUri();
    }

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

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

@@ -280,11 +286,29 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public DBNBrowseSettings getNavigatorSettings() {
        return dataSourceContainer.getNavigatorSettings();
    }

    @Property
+    @NotNull
+    public DBNBrowseSettings getDefaultNavigatorSettings() {
+        return dataSourceContainer.getNavigatorSettings().getOriginalSettings();
+    }
+
+    @Property
+    @NotNull
+    public Map<String, String> getDefaultUserPreferences() {
+        DBPPreferenceStore preferenceStore = dataSourceContainer.getPreferenceStore();
+        if (preferenceStore instanceof DataSourcePreferenceStore dataSourcePreferenceStore) {
+            return dataSourcePreferenceStore.getProperties();
+        }
+        return Collections.emptyMap();
+    }
+
+    @Property
+    @NotNull
    public List<WebDataFormat> getSupportedDataFormats() {
        List<WebDataFormat> formats = new ArrayList<>();
        formats.add(WebDataFormat.resultset);
@@ -299,11 +323,13 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public WebConnectionOriginInfo getOrigin() {
        return new WebConnectionOriginInfo(session, dataSourceContainer, dataSourceContainer.getOrigin());
    }

    @Property
+    @NotNull
    public DBPDriverConfigurationType getConfigurationType() {
        DBPDriverConfigurationType configurationType = dataSourceContainer.getConnectionConfiguration().getConfigurationType();
        if (configurationType == null) {
@@ -319,21 +345,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 +398,7 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public List<WebNetworkHandlerConfig> getNetworkHandlersConfig() {
        var registry = NetworkHandlerRegistry.getInstance();
        return dataSourceContainer.getConnectionConfiguration()
@@ -370,20 +413,23 @@ public class WebConnectionInfo {
    }

    @Property
+    @Nullable
    public Map<String, Object> getCredentials() {
        //dataSourceContainer.getConnectionConfiguration().getCredentialsProvider().getCredentials();
        return null;
    }

+    @Nullable
    public Map<String, Object> getSavedAuthProperties() {
        return savedAuthProperties;
    }

+    @Nullable
    public List<WebNetworkHandlerConfigInput> getSavedNetworkCredentials() {
        return savedNetworkCredentials;
    }

-    public void setSavedCredentials(Map<String, Object> authProperties, List<WebNetworkHandlerConfigInput> networkCredentials) {
+    public void setSavedCredentials(@Nullable Map<String, Object> authProperties, @Nullable List<WebNetworkHandlerConfigInput> networkCredentials) {
        this.savedAuthProperties = authProperties;
        this.savedNetworkCredentials = networkCredentials;
    }
@@ -408,6 +454,7 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public Map<String, String> getMainPropertyValues() {
        Map<String, String> mainProperties = new LinkedHashMap<>();
        mainProperties.put(DBConstants.PROP_HOST, getHost());
@@ -417,6 +464,17 @@ public class WebConnectionInfo {
        return mainProperties;
    }

+    @Property
+    public Map<String, Object> getExpertSettingsValues() {
+        Map<String, Object> expertSettings = new LinkedHashMap<>();
+        expertSettings.put(WebExpertSettingsProperties.PROP_AUTO_COMMIT, isAutocommit());
+        expertSettings.put(WebExpertSettingsProperties.PROP_KEEP_ALIVE_INTERVAL, getKeepAliveInterval());
+        expertSettings.put(WebExpertSettingsProperties.PROP_READ_ONLY, isReadOnly());
+        expertSettings.put(WebExpertSettingsProperties.PROP_DEFAULT_CATALOG, getDefaultCatalogName());
+        expertSettings.put(WebExpertSettingsProperties.PROP_DEFAULT_SCHEMA, getDefaultSchemaName());
+        return expertSettings;
+    }
+
    @Property
    public Map<String, String> getProviderProperties() {
        return dataSourceContainer.getConnectionConfiguration().getProviderProperties();
@@ -452,7 +510,7 @@ public class WebConnectionInfo {
        return dataSourceContainer.getRequiredExternalAuth();
    }

-    private boolean hasProjectPermission(RMProjectPermission projectPermission) {
+    private boolean hasProjectPermission(@NotNull RMProjectPermission projectPermission) {
        DBPProject project = dataSourceContainer.getProject();
        if (!(project instanceof WebProjectImpl webProject)) {
            return false;
@@ -492,18 +550,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()
@@ -511,8 +572,8 @@ public class WebConnectionInfo {
            .collect(Collectors.toList());
    }

-    @NotNull
    @Property
+    @NotNull
    public List<String> getTools() {
        if (!session.hasPermission(RMConstants.PERMISSION_DATABASE_DEVELOPER)) {
            return List.of();
@@ -531,4 +592,5 @@ public class WebConnectionInfo {
    public void setCredentialsSavedInSession(@Nullable Boolean credentialsSavedInSession) {
        this.credentialsSavedInSession = credentialsSavedInSession;
    }
+
 }
@@ -0,0 +1,88 @@
+package io.cloudbeaver.model;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.DBPObject;
+import org.jkiss.dbeaver.model.connection.DBPDriver;
+import org.jkiss.dbeaver.model.connection.DBPDriverConstants;
+import org.jkiss.dbeaver.model.meta.IPropertyValueValidator;
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.utils.CommonUtils;
+
+/**
+ * Web expert settings properties. Class for returning filtered expert settings properties in web interface.
+ */
+public class WebExpertSettingsProperties implements DBPObject {
+    public static final String PROP_READ_ONLY = "readOnly";
+    public static final String PROP_AUTO_COMMIT = "autocommit";
+    public static final String PROP_KEEP_ALIVE_INTERVAL = "keepAliveInterval";
+    public static final String PROP_DEFAULT_CATALOG = "defaultCatalogName";
+    public static final String PROP_DEFAULT_SCHEMA = "defaultSchemaName";
+
+    private final DBPDriver driver;
+
+    public WebExpertSettingsProperties(@NotNull DBPDriver driver) {
+        this.driver = driver;
+    }
+
+    @Property(order = 1, id = PROP_KEEP_ALIVE_INTERVAL, visibleIf = KeepAliveIntervalFieldValidator.class)
+    public int getKeepAliveInterval() {
+        return 0;
+    }
+
+    @Property(order = 2, id = PROP_AUTO_COMMIT, visibleIf = AutoCommitFieldValidator.class)
+    public boolean isAutoCommit() {
+        return true;
+    }
+
+    @Property(order = 3, id = PROP_READ_ONLY, visibleIf = ReadOnlyFieldValidator.class)
+    public boolean isReadOnly() {
+        return false;
+    }
+
+    @Property(order = 4, id = PROP_DEFAULT_CATALOG, visibleIf = DefaultCatalogFieldVisibleValidator.class)
+    public String getDefaultCatalog() {
+        return null;
+    }
+
+    @Property(order = 5, id = PROP_DEFAULT_SCHEMA, visibleIf = DefaultSchemaFieldVisibleValidator.class)
+    public String getDefaultSchema() {
+        return null;
+    }
+
+
+    public static class KeepAliveIntervalFieldValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
+        @Override
+        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(@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(@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(@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(@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;
+}
--- a/Show More
+++ b/Show More