From 705391f82a13f6b057e40c91e024c0162c502817 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Tue, 28 Oct 2025 09:13:37 +0000
Subject: [PATCH 1/2] :bookmark: chore(release): v1.6.0 [skip ci]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# [1.6.0](https://github.com/perfect-panel/ppanel-web/compare/v1.5.4...v1.6.0) (2025-10-28)

### ✨ Features

* Add server installation dialog and commands ([4429c9d](https://github.com/perfect-panel/ppanel-web/commit/4429c9d))

### 🐛 Bug Fixes

* Add typeRoots configuration to ensure type definitions are resolved correctly ([ad60ea9](https://github.com/perfect-panel/ppanel-web/commit/ad60ea9))
---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12eeeec..5c39b97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+<a name="readme-top"></a>
+# Changelog
+
+# [1.6.0](https://github.com/perfect-panel/ppanel-web/compare/v1.5.4...v1.6.0) (2025-10-28)
+
+
+### ✨ Features
+
+* Add server installation dialog and commands ([4429c9d](https://github.com/perfect-panel/ppanel-web/commit/4429c9d))
+
+
+### 🐛 Bug Fixes
+
+* Add typeRoots configuration to ensure type definitions are resolved correctly ([ad60ea9](https://github.com/perfect-panel/ppanel-web/commit/ad60ea9))
+
 <a name="readme-top"></a>
 
 # Changelog
diff --git a/package.json b/package.json
index 0bc9840..4f9cf10 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppanel-web",
-  "version": "1.5.4",
+  "version": "1.6.0",
   "private": true,
   "homepage": "https://github.com/perfect-panel/ppanel-web",
   "bugs": {

From 5318b9cf44b8ff1d3c2dacd327af6a8bfafe065b Mon Sep 17 00:00:00 2001
From: Ember Moth <ember_moth@proton.me>
Date: Sun, 2 Nov 2025 16:48:41 +0800
Subject: [PATCH 2/2] Refactor protocol configuration logic in server form

---
 apps/admin/app/dashboard/servers/server-form.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/admin/app/dashboard/servers/server-form.tsx b/apps/admin/app/dashboard/servers/server-form.tsx
index f2a5e77..4857462 100644
--- a/apps/admin/app/dashboard/servers/server-form.tsx
+++ b/apps/admin/app/dashboard/servers/server-form.tsx
@@ -356,7 +356,8 @@ export default function ServerForm(props: {
         ...initialValues,
         protocols: PROTOCOLS.map((type) => {
           const existingProtocol = initialValues.protocols?.find((p) => p.type === type);
-          return existingProtocol || getProtocolDefaultConfig(type);
+          const defaultConfig = getProtocolDefaultConfig(type);
+          return existingProtocol ? { ...defaultConfig, ...existingProtocol } : defaultConfig;
         }),
       });
     }