From e42d34ac58756c558ffc44a00b118670a47288d2 Mon Sep 17 00:00:00 2001
From: sergeyteleshev <iamsergeyteleshev@gmail.com>
Date: Fri, 22 May 2026 10:11:59 +0200
Subject: [PATCH] [CB] Ability to add a new MCP agent (#4329)

* dbeaver/pro#9126 initial commit for PR message

* adds validations

* adds json linter

* reverts safeParseSchema

* removes reset button

---------

Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 webapp/packages/core-ui/src/Form/FormState.ts   | 2 +-
 webapp/packages/core-ui/src/Form/IFormState.ts  | 2 +-
 webapp/packages/core-ui/src/index.ts            | 2 +-
 webapp/packages/plugin-codemirror6/package.json | 1 +
 webapp/packages/plugin-codemirror6/src/index.ts | 6 ++++--
 webapp/yarn.lock                                | 1 +
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/webapp/packages/core-ui/src/Form/FormState.ts b/webapp/packages/core-ui/src/Form/FormState.ts
index 332c0b8ad1..18bf8231df 100644
--- a/webapp/packages/core-ui/src/Form/FormState.ts
+++ b/webapp/packages/core-ui/src/Form/FormState.ts
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
diff --git a/webapp/packages/core-ui/src/Form/IFormState.ts b/webapp/packages/core-ui/src/Form/IFormState.ts
index 884b6ba27c..2090a0c24b 100644
--- a/webapp/packages/core-ui/src/Form/IFormState.ts
+++ b/webapp/packages/core-ui/src/Form/IFormState.ts
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
diff --git a/webapp/packages/core-ui/src/index.ts b/webapp/packages/core-ui/src/index.ts
index 113782aea8..53bd6bf220 100644
--- a/webapp/packages/core-ui/src/index.ts
+++ b/webapp/packages/core-ui/src/index.ts
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
diff --git a/webapp/packages/plugin-codemirror6/package.json b/webapp/packages/plugin-codemirror6/package.json
index 8996eb8570..19bca042cd 100644
--- a/webapp/packages/plugin-codemirror6/package.json
+++ b/webapp/packages/plugin-codemirror6/package.json
@@ -36,6 +36,7 @@
     "@codemirror/lang-sql": "^6",
     "@codemirror/lang-xml": "^6",
     "@codemirror/language": "^6",
+    "@codemirror/lint": "^6",
     "@codemirror/merge": "^6",
     "@codemirror/search": "^6",
     "@codemirror/state": "^6",
diff --git a/webapp/packages/plugin-codemirror6/src/index.ts b/webapp/packages/plugin-codemirror6/src/index.ts
index 7a124789bc..3ac394984f 100644
--- a/webapp/packages/plugin-codemirror6/src/index.ts
+++ b/webapp/packages/plugin-codemirror6/src/index.ts
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,11 @@ export * from '@codemirror/state';
 export * from '@codemirror/autocomplete';
 export * from './highlightNewLine.js';
 
+export { history } from '@codemirror/commands';
 export { html as HTML_EDITOR } from '@codemirror/lang-html';
 export { javascript as JAVASCRIPT_EDITOR } from '@codemirror/lang-javascript';
-export { json as JSON_EDITOR } from '@codemirror/lang-json';
+export { json as JSON_EDITOR, jsonParseLinter } from '@codemirror/lang-json';
+export { linter, lintGutter } from '@codemirror/lint';
 export { sql as SQL_EDITOR, SQLDialect } from '@codemirror/lang-sql';
 export { xml as XML_EDITOR } from '@codemirror/lang-xml';
 
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index ea9b67f839..b3d07b4a4f 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2588,6 +2588,7 @@ __metadata:
     "@codemirror/lang-sql": "npm:^6"
     "@codemirror/lang-xml": "npm:^6"
     "@codemirror/language": "npm:^6"
+    "@codemirror/lint": "npm:^6"
     "@codemirror/merge": "npm:^6"
     "@codemirror/search": "npm:^6"
     "@codemirror/state": "npm:^6"