diff --git a/package-lock.json b/package-lock.json
index b37d3c8..97900a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,10 +6,14 @@
     "": {
       "dependencies": {
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
         "json-server": "^1.0.0-beta.3",
         "marked": "^2.0.1",
         "pinia": "^3.0.3",
         "pinia-plugin-persistedstate": "^4.5.0"
+<<<<<<< HEAD
 =======
         "markdown-it": "^14.1.0",
         "marked": "^2.0.1"
@@ -63,13 +67,14 @@
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
 >>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
       }
     },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.27.1",
       "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
       "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6.9.0"
@@ -79,7 +84,6 @@
       "version": "7.28.5",
       "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
       "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6.9.0"
@@ -89,7 +93,6 @@
       "version": "7.28.5",
       "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.28.5.tgz",
       "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/types": "^7.28.5"
@@ -105,7 +108,6 @@
       "version": "7.28.5",
       "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.28.5.tgz",
       "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -119,20 +121,17 @@
       "version": "1.5.5",
       "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
       "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/@polka/url": {
       "version": "1.0.0-next.29",
       "resolved": "https://registry.npmmirror.com/@polka/url/-/url-1.0.0-next.29.tgz",
-      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
-      "license": "MIT"
+      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww=="
     },
     "node_modules/@tinyhttp/accepts": {
       "version": "2.2.3",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/accepts/-/accepts-2.2.3.tgz",
       "integrity": "sha512-9pQN6pJAJOU3McmdJWTcyq7LLFW8Lj5q+DadyKcvp+sxMkEpktKX5sbfJgJuOvjk6+1xWl7pe0YL1US1vaO/1w==",
-      "license": "MIT",
       "dependencies": {
         "mime": "4.0.4",
         "negotiator": "^0.6.3"
@@ -149,7 +148,6 @@
       "version": "2.5.2",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/app/-/app-2.5.2.tgz",
       "integrity": "sha512-DcB3Y8GQppLQlO2VxRYF7LzTEAoZb+VRQXuIsErcu2fNaM1xdx6NQZDso5rlZUiaeg6KYYRfU34N4XkZbv6jSA==",
-      "license": "MIT",
       "dependencies": {
         "@tinyhttp/cookie": "2.1.1",
         "@tinyhttp/proxy-addr": "2.2.1",
@@ -171,7 +169,6 @@
       "version": "2.2.2",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/content-disposition/-/content-disposition-2.2.2.tgz",
       "integrity": "sha512-crXw1txzrS36huQOyQGYFvhTeLeG0Si1xu+/l6kXUVYpE0TjFjEZRqTbuadQLfKGZ0jaI+jJoRyqaWwxOSHW2g==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.20.0"
       },
@@ -184,7 +181,6 @@
       "version": "0.1.4",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/content-type/-/content-type-0.1.4.tgz",
       "integrity": "sha512-dl6f3SHIJPYbhsW1oXdrqOmLSQF/Ctlv3JnNfXAE22kIP7FosqJHxkz/qj2gv465prG8ODKH5KEyhBkvwrueKQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.4"
       }
@@ -193,7 +189,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/cookie/-/cookie-2.1.1.tgz",
       "integrity": "sha512-h/kL9jY0e0Dvad+/QU3efKZww0aTvZJslaHj3JTPmIPC9Oan9+kYqmh3M6L5JUQRuTJYFK2nzgL2iJtH2S+6dA==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.20.0"
       },
@@ -206,7 +201,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/cookie-signature/-/cookie-signature-2.1.1.tgz",
       "integrity": "sha512-VDsSMY5OJfQJIAtUgeQYhqMPSZptehFSfvEEtxr+4nldPA8IImlp3QVcOVuK985g4AFR4Hl1sCbWCXoqBnVWnw==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.20.0"
       }
@@ -215,7 +209,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/cors/-/cors-2.0.1.tgz",
       "integrity": "sha512-qrmo6WJuaiCzKWagv2yA/kw6hIISfF/hOqPWwmI6w0o8apeTMmRN3DoCFvQ/wNVuWVdU5J4KU7OX8aaSOEq51A==",
-      "license": "MIT",
       "dependencies": {
         "@tinyhttp/vary": "^0.1.3"
       },
@@ -227,7 +220,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/encode-url/-/encode-url-2.1.1.tgz",
       "integrity": "sha512-AhY+JqdZ56qV77tzrBm0qThXORbsVjs/IOPgGCS7x/wWnsa/Bx30zDUU/jPAUcSzNOzt860x9fhdGpzdqbUeUw==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.20.0"
       }
@@ -236,7 +228,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/etag/-/etag-2.1.2.tgz",
       "integrity": "sha512-j80fPKimGqdmMh6962y+BtQsnYPVCzZfJw0HXjyH70VaJBHLKGF+iYhcKqzI3yef6QBNa8DKIPsbEYpuwApXTw==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.20.0"
       }
@@ -245,7 +236,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/forwarded/-/forwarded-2.1.2.tgz",
       "integrity": "sha512-9H/eulJ68ElY/+zYpTpNhZ7vxGV+cnwaR6+oQSm7bVgZMyuQfgROW/qvZuhmgDTIxnGMXst+Ba4ij6w6Krcs3w==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.20.0"
       }
@@ -254,7 +244,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/logger/-/logger-2.1.0.tgz",
       "integrity": "sha512-Ma1fJ9CwUbn9r61/4HW6+nflsVoslpOnCrfQ6UeZq7GGIgwLzofms3HoSVG7M+AyRMJpxlfcDdbH5oFVroDMKA==",
-      "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.20",
         "dayjs": "^1.11.13",
@@ -268,7 +257,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/proxy-addr/-/proxy-addr-2.2.1.tgz",
       "integrity": "sha512-BicqMqVI91hHq2BQmnqJUh0FQUnx7DncwSGgu2ghlh+JZG2rHK2ZN/rXkfhrx1rrUw6hnd0L36O8GPMh01+dDQ==",
-      "license": "MIT",
       "dependencies": {
         "@tinyhttp/forwarded": "2.1.2",
         "ipaddr.js": "^2.2.0"
@@ -281,7 +269,6 @@
       "version": "2.2.5",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/req/-/req-2.2.5.tgz",
       "integrity": "sha512-trfsXwtmsNjMcGKcLJ+45h912kLRqBQCQD06ams3Tq0kf4gHLxjHjoYOC1Z9yGjOn81XllRx8wqvnvr+Kbe3gw==",
-      "license": "MIT",
       "dependencies": {
         "@tinyhttp/accepts": "2.2.3",
         "@tinyhttp/type-is": "2.2.4",
@@ -296,7 +283,6 @@
       "version": "2.2.5",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/res/-/res-2.2.5.tgz",
       "integrity": "sha512-yBsqjWygpuKAVz4moWlP4hqzwiDDqfrn2mA0wviJAcgvGiyOErtlQwXY7aj3aPiCpURvxvEFO//Gdy6yV+xEpA==",
-      "license": "MIT",
       "dependencies": {
         "@tinyhttp/content-disposition": "2.2.2",
         "@tinyhttp/cookie": "2.1.1",
@@ -316,7 +302,6 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/router/-/router-2.2.3.tgz",
       "integrity": "sha512-O0MQqWV3Vpg/uXsMYg19XsIgOhwjyhTYWh51Qng7bxqXixxx2PEvZWnFjP7c84K7kU/nUX41KpkEBTLnznk9/Q==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.20.0"
       }
@@ -325,7 +310,6 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/send/-/send-2.2.3.tgz",
       "integrity": "sha512-o4cVHHGQ8WjVBS8UT0EE/2WnjoybrfXikHwsRoNlG1pfrC/Sd01u1N4Te8cOd/9aNGLr4mGxWb5qTm2RRtEi7g==",
-      "license": "MIT",
       "dependencies": {
         "@tinyhttp/content-type": "^0.1.4",
         "@tinyhttp/etag": "2.1.2",
@@ -339,7 +323,6 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/type-is/-/type-is-2.2.4.tgz",
       "integrity": "sha512-7F328NheridwjIfefBB2j1PEcKKABpADgv7aCJaE8x8EON77ZFrAkI3Rir7pGjopV7V9MBmW88xUQigBEX2rmQ==",
-      "license": "MIT",
       "dependencies": {
         "@tinyhttp/content-type": "^0.1.4",
         "mime": "4.0.4"
@@ -352,7 +335,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/url/-/url-2.1.1.tgz",
       "integrity": "sha512-POJeq2GQ5jI7Zrdmj22JqOijB5/GeX+LEX7DUdml1hUnGbJOTWDx7zf2b5cCERj7RoXL67zTgyzVblBJC+NJWg==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.20.0"
       }
@@ -361,7 +343,6 @@
       "version": "0.1.3",
       "resolved": "https://registry.npmmirror.com/@tinyhttp/vary/-/vary-0.1.3.tgz",
       "integrity": "sha512-SoL83sQXAGiHN1jm2VwLUWQSQeDAAl1ywOm6T0b0Cg1CZhVsjoiZadmjhxF6FHCCY7OHHVaLnTgSMxTPIDLxMg==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.20"
       }
@@ -370,7 +351,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.5.22.tgz",
       "integrity": "sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/parser": "^7.28.4",
@@ -384,7 +364,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.5.22.tgz",
       "integrity": "sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@vue/compiler-core": "3.5.22",
@@ -395,7 +374,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.5.22.tgz",
       "integrity": "sha512-tbTR1zKGce4Lj+JLzFXDq36K4vcSZbJ1RBu8FxcDv1IGRz//Dh2EBqksyGVypz3kXpshIfWKGOCcqpSbyGWRJQ==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/parser": "^7.28.4",
@@ -413,7 +391,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.5.22.tgz",
       "integrity": "sha512-GdgyLvg4R+7T8Nk2Mlighx7XGxq/fJf9jaVofc3IL0EPesTE86cP/8DD1lT3h1JeZr2ySBvyqKQJgbS54IX1Ww==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.22",
@@ -424,7 +401,6 @@
       "version": "7.7.7",
       "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-7.7.7.tgz",
       "integrity": "sha512-lwOnNBH2e7x1fIIbVT7yF5D+YWhqELm55/4ZKf45R9T8r9dE2AIOy8HKjfqzGsoTHFbWbr337O4E0A0QADnjBg==",
-      "license": "MIT",
       "dependencies": {
         "@vue/devtools-kit": "^7.7.7"
       }
@@ -433,7 +409,6 @@
       "version": "7.7.7",
       "resolved": "https://registry.npmmirror.com/@vue/devtools-kit/-/devtools-kit-7.7.7.tgz",
       "integrity": "sha512-wgoZtxcTta65cnZ1Q6MbAfePVFxfM+gq0saaeytoph7nEa7yMXoi6sCPy4ufO111B9msnw0VOWjPEFCXuAKRHA==",
-      "license": "MIT",
       "dependencies": {
         "@vue/devtools-shared": "^7.7.7",
         "birpc": "^2.3.0",
@@ -448,7 +423,6 @@
       "version": "7.7.7",
       "resolved": "https://registry.npmmirror.com/@vue/devtools-shared/-/devtools-shared-7.7.7.tgz",
       "integrity": "sha512-+udSj47aRl5aKb0memBvcUG9koarqnxNM5yjuREvqwK6T3ap4mn3Zqqc17QrBFTqSMjr3HK1cvStEZpMDpfdyw==",
-      "license": "MIT",
       "dependencies": {
         "rfdc": "^1.4.1"
       }
@@ -457,7 +431,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.22.tgz",
       "integrity": "sha512-f2Wux4v/Z2pqc9+4SmgZC1p73Z53fyD90NFWXiX9AKVnVBEvLFOWCEgJD3GdGnlxPZt01PSlfmLqbLYzY/Fw4A==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@vue/shared": "3.5.22"
@@ -467,7 +440,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.5.22.tgz",
       "integrity": "sha512-EHo4W/eiYeAzRTN5PCextDUZ0dMs9I8mQ2Fy+OkzvRPUYQEyK9yAjbasrMCXbLNhF7P0OUyivLjIy0yc6VrLJQ==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@vue/reactivity": "3.5.22",
@@ -478,7 +450,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.5.22.tgz",
       "integrity": "sha512-Av60jsryAkI023PlN7LsqrfPvwfxOd2yAwtReCjeuugTJTkgrksYJJstg1e12qle0NarkfhfFu1ox2D+cQotww==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@vue/reactivity": "3.5.22",
@@ -491,7 +462,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.5.22.tgz",
       "integrity": "sha512-gXjo+ao0oHYTSswF+a3KRHZ1WszxIqO7u6XwNHqcqb9JfyIL/pbWrrh/xLv7jeDqla9u+LK7yfZKHih1e1RKAQ==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@vue/compiler-ssr": "3.5.22",
@@ -505,14 +475,12 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.22.tgz",
       "integrity": "sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/birpc": {
       "version": "2.6.1",
       "resolved": "https://registry.npmmirror.com/birpc/-/birpc-2.6.1.tgz",
       "integrity": "sha512-LPnFhlDpdSH6FJhJyn4M0kFO7vtQ5iPw24FnG0y21q09xC7e8+1LeR31S1MAIrDAHp4m7aas4bEkTDTvMAtebQ==",
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
@@ -521,7 +489,6 @@
       "version": "5.6.2",
       "resolved": "https://registry.npmmirror.com/chalk/-/chalk-5.6.2.tgz",
       "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
-      "license": "MIT",
       "engines": {
         "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
@@ -533,7 +500,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-4.0.3.tgz",
       "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "license": "MIT",
       "dependencies": {
         "readdirp": "^4.0.1"
       },
@@ -547,14 +513,12 @@
     "node_modules/colorette": {
       "version": "2.0.20",
       "resolved": "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "license": "MIT"
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
     },
     "node_modules/copy-anything": {
       "version": "4.0.5",
       "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-4.0.5.tgz",
       "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==",
-      "license": "MIT",
       "dependencies": {
         "is-what": "^5.2.0"
       },
@@ -569,38 +533,32 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/dayjs": {
       "version": "1.11.18",
       "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.18.tgz",
-      "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==",
-      "license": "MIT"
+      "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA=="
     },
     "node_modules/deep-pick-omit": {
       "version": "1.2.1",
       "resolved": "https://registry.npmmirror.com/deep-pick-omit/-/deep-pick-omit-1.2.1.tgz",
-      "integrity": "sha512-2J6Kc/m3irCeqVG42T+SaUMesaK7oGWaedGnQQK/+O0gYc+2SP5bKh/KKTE7d7SJ+GCA9UUE1GRzh6oDe0EnGw==",
-      "license": "MIT"
+      "integrity": "sha512-2J6Kc/m3irCeqVG42T+SaUMesaK7oGWaedGnQQK/+O0gYc+2SP5bKh/KKTE7d7SJ+GCA9UUE1GRzh6oDe0EnGw=="
     },
     "node_modules/defu": {
       "version": "6.1.4",
       "resolved": "https://registry.npmmirror.com/defu/-/defu-6.1.4.tgz",
-      "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
-      "license": "MIT"
+      "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg=="
     },
     "node_modules/destr": {
       "version": "2.0.5",
       "resolved": "https://registry.npmmirror.com/destr/-/destr-2.0.5.tgz",
-      "integrity": "sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==",
-      "license": "MIT"
+      "integrity": "sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA=="
     },
     "node_modules/dot-prop": {
       "version": "9.0.0",
       "resolved": "https://registry.npmmirror.com/dot-prop/-/dot-prop-9.0.0.tgz",
       "integrity": "sha512-1gxPBJpI/pcjQhKgIU91II6Wkay+dLcN3M6rf2uwP8hRur3HtQXjVrdAK3sjC0piaEuxzMwjXChcETiJl47lAQ==",
-      "license": "MIT",
       "dependencies": {
         "type-fest": "^4.18.2"
       },
@@ -611,296 +569,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-      "dev": true
-    },
-    "node_modules/basic-auth": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/basic-auth/-/basic-auth-2.0.1.tgz",
-      "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "5.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/basic-auth/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.5",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.13.0",
-        "raw-body": "2.5.2",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-      "dev": true,
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/call-bound": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmmirror.com/call-bound/-/call-bound-1.0.4.tgz",
-      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "get-intrinsic": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmmirror.com/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmmirror.com/compression/-/compression-1.8.1.tgz",
-      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "compressible": "~2.0.18",
-        "debug": "2.6.9",
-        "negotiator": "~0.6.4",
-        "on-headers": "~1.1.0",
-        "safe-buffer": "5.2.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/connect-pause": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmmirror.com/connect-pause/-/connect-pause-0.1.1.tgz",
-      "integrity": "sha512-a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.7.1.tgz",
-      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-      "dev": true
-    },
-    "node_modules/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmmirror.com/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4",
-        "vary": "^1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-      "dev": true
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/entities": {
       "version": "4.5.0",
       "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "license": "BSD-2-Clause",
       "peer": true,
       "engines": {
         "node": ">=0.12"
@@ -910,11 +582,13 @@
       }
     },
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
     "node_modules/es-escape-html": {
       "version": "0.1.1",
       "resolved": "https://registry.npmmirror.com/es-escape-html/-/es-escape-html-0.1.1.tgz",
       "integrity": "sha512-yUx1o+8RsG7UlszmYPtks+dm6Lho2m8lgHMOsLJQsFI0R8XwUJwiMhM1M4E/S8QLeGyf6MkDV/pWgjQ0tdTSyQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.x"
       }
@@ -923,14 +597,12 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/eta": {
       "version": "3.5.0",
       "resolved": "https://registry.npmmirror.com/eta/-/eta-3.5.0.tgz",
       "integrity": "sha512-e3x3FBvGzeCIHhF+zhK8FZA2vC5uFn6b4HJjegUbIWrDb4mJ7JjTGMJY9VGIbRVpmSwHopNiaJibhjIr+HfLug==",
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       },
@@ -942,7 +614,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmmirror.com/header-range-parser/-/header-range-parser-1.1.3.tgz",
       "integrity": "sha512-B9zCFt3jH8g09LR1vHL4pcAn8yMEtlSlOUdQemzHMRKMImNIhhszdeosYFfNW0WXKQtXIlWB+O4owHJKvEJYaA==",
-      "license": "MIT",
       "engines": {
         "node": ">=12.22.0"
       }
@@ -950,20 +621,17 @@
     "node_modules/hookable": {
       "version": "5.5.3",
       "resolved": "https://registry.npmmirror.com/hookable/-/hookable-5.5.3.tgz",
-      "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
-      "license": "MIT"
+      "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ=="
     },
     "node_modules/http-status-emojis": {
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/http-status-emojis/-/http-status-emojis-2.2.0.tgz",
-      "integrity": "sha512-ompKtgwpx8ff0hsbpIB7oE4ax1LXoHmftsHHStMELX56ivG3GhofTX8ZHWlUaFKfGjcGjw6G3rPk7dJRXMmbbg==",
-      "license": "MIT"
+      "integrity": "sha512-ompKtgwpx8ff0hsbpIB7oE4ax1LXoHmftsHHStMELX56ivG3GhofTX8ZHWlUaFKfGjcGjw6G3rPk7dJRXMmbbg=="
     },
     "node_modules/inflection": {
       "version": "3.0.2",
       "resolved": "https://registry.npmmirror.com/inflection/-/inflection-3.0.2.tgz",
       "integrity": "sha512-+Bg3+kg+J6JUWn8J6bzFmOWkTQ6L/NHfDRSYU+EVvuKHDxUDHAXgqixHfVlzuBQaPOTac8hn43aPhMNk6rMe3g==",
-      "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
       }
@@ -972,7 +640,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
       "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
-      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
@@ -981,7 +648,6 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmmirror.com/is-what/-/is-what-5.5.0.tgz",
       "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==",
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -993,6 +659,7 @@
       "version": "1.0.0-beta.3",
       "resolved": "https://registry.npmmirror.com/json-server/-/json-server-1.0.0-beta.3.tgz",
       "integrity": "sha512-DwE69Ep5ccwIJZBUIWEENC30Yj8bwr4Ax9W9VoIWAYnB8Sj4ReptscO8/DRHv/nXwVlmb3Bk73Ls86+VZdYkkA==",
+<<<<<<< HEAD
       "license": "SEE LICENSE IN ./LICENSE",
 =======
     "node_modules/errorhandler": {
@@ -1425,6 +1092,8 @@
       "resolved": "https://registry.npmmirror.com/markdown-it/-/markdown-it-14.1.0.tgz",
       "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==",
 >>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
       "dependencies": {
         "@tinyhttp/app": "^2.4.0",
         "@tinyhttp/cors": "^2.0.1",
@@ -1451,7 +1120,6 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -1463,7 +1131,6 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmmirror.com/lowdb/-/lowdb-7.0.1.tgz",
       "integrity": "sha512-neJAj8GwF0e8EpycYIDFqEPcx9Qz4GUho20jWFR7YiFeXzF1YMLdxB36PypcTSPMA+4+LvgyMacYhlr18Zlymw==",
-      "license": "MIT",
       "dependencies": {
         "steno": "^4.0.2"
       },
@@ -1478,7 +1145,6 @@
       "version": "0.30.21",
       "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.21.tgz",
       "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.5"
@@ -1488,7 +1154,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/marked/-/marked-2.0.1.tgz",
       "integrity": "sha512-5+/fKgMv2hARmMW7DOpykr2iLhl0NgjyELk5yn92iE7z8Se1IS9n3UsFm86hFXIkvMBmVxki8+ckcpjBeyo/hw==",
-      "license": "MIT",
       "bin": {
         "marked": "bin/marked"
       },
@@ -1497,11 +1162,13 @@
       }
     },
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
     "node_modules/milliparsec": {
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/milliparsec/-/milliparsec-4.0.0.tgz",
       "integrity": "sha512-/wk9d4Z6/9ZvoEH/6BI4TrTCgmkpZPuSRN/6fI9aUHOfXdNTuj/VhLS7d+NqG26bi6L9YmGXutVYvWC8zQ0qtA==",
-      "license": "MIT",
       "engines": {
         "node": ">=20"
       }
@@ -1513,7 +1180,6 @@
       "funding": [
         "https://github.com/sponsors/broofa"
       ],
-      "license": "MIT",
       "bin": {
         "mime": "bin/cli.js"
       },
@@ -1524,18 +1190,17 @@
     "node_modules/mitt": {
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz",
-      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
-      "license": "MIT"
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
     },
     "node_modules/mrmime": {
       "version": "2.0.1",
       "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-2.0.1.tgz",
       "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
+<<<<<<< HEAD
 =======
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
@@ -1679,14 +1344,19 @@
       "dev": true
     },
 >>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
     "node_modules/nanoid": {
       "version": "3.3.11",
       "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz",
       "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
       "dev": true,
 >>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
       "funding": [
         {
           "type": "github",
@@ -1694,10 +1364,14 @@
         }
       ],
 <<<<<<< HEAD
+<<<<<<< HEAD
       "license": "MIT",
       "peer": true,
 =======
 >>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
+=======
+      "peer": true,
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -1710,33 +1384,36 @@
       "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.4.tgz",
       "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
 <<<<<<< HEAD
+<<<<<<< HEAD
       "license": "MIT",
 =======
       "dev": true,
 >>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
       "engines": {
         "node": ">= 0.6"
       }
     },
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
     "node_modules/perfect-debounce": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
-      "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
-      "license": "MIT"
+      "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA=="
     },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "license": "ISC",
       "peer": true
     },
     "node_modules/pinia": {
       "version": "3.0.3",
       "resolved": "https://registry.npmmirror.com/pinia/-/pinia-3.0.3.tgz",
       "integrity": "sha512-ttXO/InUULUXkMHpTdp9Fj4hLpD/2AoJdmAbAeW2yu1iy1k+pkFekQXw5VpC0/5p51IOR/jDaDRfRWRnMMsGOA==",
-      "license": "MIT",
       "dependencies": {
         "@vue/devtools-api": "^7.7.2"
       },
@@ -1757,7 +1434,6 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmmirror.com/pinia-plugin-persistedstate/-/pinia-plugin-persistedstate-4.5.0.tgz",
       "integrity": "sha512-QTkP1xJVyCdr2I2p3AKUZM84/e+IS+HktRxKGAIuDzkyaKKV48mQcYkJFVVDuvTxlI5j6X3oZObpqoVB8JnWpw==",
-      "license": "MIT",
       "dependencies": {
         "deep-pick-omit": "^1.2.1",
         "defu": "^6.1.4",
@@ -1798,7 +1474,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
@@ -1813,7 +1488,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-4.1.2.tgz",
       "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "license": "MIT",
       "engines": {
         "node": ">= 14.18.0"
       },
@@ -1826,7 +1500,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmmirror.com/regexparam/-/regexparam-2.0.2.tgz",
       "integrity": "sha512-A1PeDEYMrkLrfyOwv2jwihXbo9qxdGD3atBYQA9JJgreAx8/7rC6IUkWOw2NQlOxLp2wL0ifQbh1HuidDfYA6w==",
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1834,14 +1507,12 @@
     "node_modules/rfdc": {
       "version": "1.4.1",
       "resolved": "https://registry.npmmirror.com/rfdc/-/rfdc-1.4.1.tgz",
-      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
-      "license": "MIT"
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA=="
     },
     "node_modules/sirv": {
       "version": "2.0.4",
       "resolved": "https://registry.npmmirror.com/sirv/-/sirv-2.0.4.tgz",
       "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
-      "license": "MIT",
       "dependencies": {
         "@polka/url": "^1.0.0-next.24",
         "mrmime": "^2.0.0",
@@ -1855,7 +1526,6 @@
       "version": "6.1.1",
       "resolved": "https://registry.npmmirror.com/sort-on/-/sort-on-6.1.1.tgz",
       "integrity": "sha512-PB8pVvXAoRBijBCvuKJnmo06D8mSnQlLij0abfB2VdOpfFm29sPGYD4ft2prUPo1AZXTnkn3pP48AppRWyMkrw==",
-      "license": "MIT",
       "dependencies": {
         "dot-prop": "^9.0.0"
       },
@@ -1870,8 +1540,8 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "license": "BSD-3-Clause",
       "peer": true,
+<<<<<<< HEAD
 =======
     "node_modules/object-assign": {
       "version": "4.1.1",
@@ -1879,16 +1549,20 @@
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
 >>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
       "engines": {
         "node": ">=0.10.0"
       }
     },
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
     "node_modules/speakingurl": {
       "version": "14.0.1",
       "resolved": "https://registry.npmmirror.com/speakingurl/-/speakingurl-14.0.1.tgz",
       "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -1897,7 +1571,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmmirror.com/steno/-/steno-4.0.2.tgz",
       "integrity": "sha512-yhPIQXjrlt1xv7dyPQg2P17URmXbuM5pdGkpiMB3RenprfiBlvK415Lctfe0eshk90oA7/tNq7WEiMK8RSP39A==",
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -1909,7 +1582,6 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmmirror.com/superjson/-/superjson-2.2.3.tgz",
       "integrity": "sha512-ay3d+LW/S6yppKoTz3Bq4mG0xrS5bFwfWEBmQfbC7lt5wmtk+Obq0TxVuA9eYRirBTQb1K3eEpBRHMQEo0WyVw==",
-      "license": "MIT",
       "dependencies": {
         "copy-anything": "^4"
       },
@@ -1921,6 +1593,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmmirror.com/totalist/-/totalist-3.0.1.tgz",
       "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
+<<<<<<< HEAD
       "license": "MIT",
 =======
     "node_modules/object-inspect": {
@@ -2016,16 +1689,20 @@
       "resolved": "https://registry.npmmirror.com/punycode.js/-/punycode.js-2.3.1.tgz",
       "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
 >>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
       "engines": {
         "node": ">=6"
       }
     },
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
     "node_modules/type-fest": {
       "version": "4.41.0",
       "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-4.41.0.tgz",
       "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==",
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=16"
       },
@@ -2037,7 +1714,6 @@
       "version": "3.5.22",
       "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.22.tgz",
       "integrity": "sha512-toaZjQ3a/G/mYaLSbV+QsQhIdMo9x5rrqIpYRObsJ6T/J+RyCSFwN2LHNVH9v8uIcljDNa3QzPVdv3Y6b9hAJQ==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.22",
@@ -2053,6 +1729,7 @@
         "typescript": {
           "optional": true
         }
+<<<<<<< HEAD
 =======
     "node_modules/qs": {
       "version": "6.13.0",
@@ -2434,6 +2111,8 @@
       "engines": {
         "node": ">=12"
 >>>>>>> 253e01c5cbad72187fa9d8cae4a968927dd7d45a
+=======
+>>>>>>> 30de1a500e0d372ac5ce5ef2bb9f1b480a50b7c3
       }
     }
   }
diff --git a/pages.json b/pages.json
index 78c4567..be5a306 100644
--- a/pages.json
+++ b/pages.json
@@ -135,7 +135,9 @@
 			"style": {
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
-				"titleNView": false
+				"disableSwipeBack": true,
+				"titleNView": false,
+				"bounce": false
 			}
 		},
 		{
diff --git a/pages/blank/blank.vue b/pages/blank/blank.vue
index 7cb390b..4a9eaad 100644
--- a/pages/blank/blank.vue
+++ b/pages/blank/blank.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="blank-page">
-    <text class="tip">这是一个空白页</text>
+    <text class="tip">当前特斯拉该如何布局？</text>
   </view>
 </template>
 
diff --git a/pages/deepMate/deepMate.vue b/pages/deepMate/deepMate.vue
index 3958d3f..3a54ad6 100644
--- a/pages/deepMate/deepMate.vue
+++ b/pages/deepMate/deepMate.vue
@@ -63,7 +63,7 @@
       </view> -->
 
           <!-- 特斯拉推荐卡片 -->
-          <view class="recommend-card" v-if="messages.length === 0">
+          <view class="recommend-card" v-if="messages.length === 0" @click="goBlank">
             <view class="arrow" v-if="messages.length === 0"></view>
             <view class="card-content">
               <image
@@ -100,15 +100,9 @@
       <!-- 顶部粘性欢迎块：始终保留在聊天上方 -->
       <view class="chat-header" v-if="messages.length > 0">
         <view class="robot-container">
-          <image
-            src="https://d31zlh4on95l9h.cloudfront.net/images/61fa384381c88ad80be28f41827fe0e5.svg"
-            class="robot-avatar"
-          ></image>
-          <view class="welcome-message">
-            <text class="greeting">Hi, 我是您的股市随身顾问~</text>
-            <text class="description"
-              >个股诊断、市场情绪解读，都可以找我。</text
-            >
+          <image src="https://d31zlh4on95l9h.cloudfront.net/images/61fa384381c88ad80be28f41827fe0e5.svg"
+            class="robot-avatar"></image>
+          <view class="welcome-message"> <text class="greeting">Hi, 我是您的股市随身顾问~</text>
           </view>
         </view>
       </view>
@@ -225,30 +219,35 @@
 
     <!-- 搜索历史侧拉框 -->
     <view class="drawer-overlay" v-show="showHistoryDrawer"></view>
-    <view
-      class="drawer-panel"
-      v-show="showHistoryDrawer"
-      @click.stop
-      :style="{ transform: 'translateX(' + drawerOffsetX + 'px)' }"
-    >
-      <view class="drawer-back" @click="onDrawerBackClick"
-        ><text class="drawer-back-icon">></text></view
-      >
+    <view class="drawer-panel" v-show="showHistoryDrawer" @click.stop @touchmove.stop.prevent :style="{ transform: 'translateY(' + drawerOffsetY + 'px)' }">
+
       <view class="drawer-header">
-        <text class="drawer-title">搜索历史</text>
-        <!-- <text class="drawer-close" @click="closeHistoryDrawer">×</text> -->
+        <text class="drawer-title">历史对话</text>
+        <view class="drawer-actions">
+          <view class="delete-all-container">
+            <image class="delete-icon" src="https://d31zlh4on95l9h.cloudfront.net/images/a62a41f8513bf00b040fd8e79cfe04f4.svg"></image>
+            <text class="delete-all" @click="clearAllHistory">删除全部</text>
+          </view>
+          <view class="drawer-close" @click="onDrawerBackClick"><text class="drawer-close-icon"></text></view>
+        </view>
       </view>
       <scroll-view scroll-y="true" class="drawer-content">
-        <view v-if="searchHistory.length === 0" class="empty-history">
-          <text>暂无搜索历史</text>
-        </view>
-        <view
-          v-for="(item, idx) in searchHistory"
-          :key="idx"
-          class="history-card"
-        >
-          <text class="history-query">{{ item.query }}</text>
-          <text class="history-time">{{ formatTime(item.time) }}</text>
+        <view class="drawer-inner">
+          <view v-if="groupedHistory.length === 0" class="empty-history">
+            <text>暂无历史记录</text>
+          </view>
+          <view v-for="(section, sIdx) in groupedHistory" :key="sIdx" class="history-section">
+            <text class="section-title">{{ section.title }}</text>
+            <view v-for="(item, idx) in section.items" :key="idx" class="history-item">
+              <view class="history-left">
+                <view class="flag-circle"><text class="flag-emoji">🇺🇸</text></view>
+              </view>
+              <view class="history-main">
+                <text class="history-query">{{ item.query }}</text>
+              </view>
+              <text class="history-time">{{ formatTime(item.time) }}</text>
+            </view>
+          </view>
         </view>
       </scroll-view>
     </view>
@@ -293,7 +292,7 @@ const chatContainerHeight = ref(0);
 const uuid = ref("");
 const messages = ref([]);
 const showHistoryDrawer = ref(false);
-const drawerOffsetX = ref(0);
+const drawerOffsetY = ref(0);
 const searchHistory = ref([]);
 const hotTopics = ref([
   {
@@ -344,6 +343,10 @@ onMounted(() => {
   // 载入历史
   const hist = uni.getStorageSync("search_history") || [];
   searchHistory.value = Array.isArray(hist) ? hist : [];
+
+  // 缓存今天日期（YYYY-MM-DD）
+  const todayStr = new Date().toISOString().slice(0, 10);
+  uni.setStorageSync('today_date', todayStr);
 });
 
 // 初始化 UUID
@@ -390,16 +393,18 @@ const goBlank = () => {
 
 // 历史抽屉控制
 const openHistoryDrawer = () => {
+  const hideDistance = uni.upx2px(900);
+  drawerOffsetY.value = hideDistance;
   showHistoryDrawer.value = true;
+  setTimeout(() => { drawerOffsetY.value = 0; }, 10);
 };
-const closeHistoryDrawer = () => {
-  showHistoryDrawer.value = false;
-};
+const closeHistoryDrawer = () => { showHistoryDrawer.value = false; };
 const onDrawerBackClick = () => {
-  drawerOffsetX.value = 500;
+  const hideDistance = uni.upx2px(900);
+  drawerOffsetY.value = hideDistance;
   setTimeout(() => {
     closeHistoryDrawer();
-    drawerOffsetX.value = 0;
+    drawerOffsetY.value = 0;
   }, 180);
 };
 
@@ -415,6 +420,67 @@ const formatTime = (t) => {
   return `${y}-${m}-${day} ${hh}:${mm}`;
 };
 
+// 历史分组（今天/昨天/近一周/按月）
+const groupedHistory = computed(() => {
+  const sections = [];
+  
+  // 从缓存获取今天日期，如果没有则使用当前日期
+  const cachedTodayStr = uni.getStorageSync('today_date');
+  const now = cachedTodayStr ? new Date(cachedTodayStr + 'T00:00:00') : new Date();
+  
+  const startOfDay = (d) => new Date(d.getFullYear(), d.getMonth(), d.getDate());
+  const isSameDay = (a, b) => startOfDay(a).getTime() === startOfDay(b).getTime();
+  const isYesterday = (d) => {
+    const y = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 1);
+    return isSameDay(d, y);
+  };
+  const isToday = (d) => isSameDay(d, now);
+  const withinLast7Days = (d) => {
+    const seven = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 7);
+    return d >= seven && !isToday(d) && !isYesterday(d);
+  };
+  const monthLabel = (d) => `${d.getMonth() + 1}月`;
+
+  const today = [];
+  const yesterday = [];
+  const last7 = [];
+  const byMonth = new Map();
+
+  searchHistory.value.forEach((item) => {
+    const dt = new Date(item.time);
+    if (isToday(dt)) {
+      today.push(item);
+    } else if (isYesterday(dt)) {
+      yesterday.push(item);
+    } else if (withinLast7Days(dt)) {
+      last7.push(item);
+    } else {
+      const year = dt.getFullYear();
+      const month = dt.getMonth() + 1;
+      const key = `${year}-${month}`;
+      if (!byMonth.has(key)) byMonth.set(key, { title: `${month}月`, year, month, items: [] });
+      byMonth.get(key).items.push(item);
+    }
+  });
+
+  if (today.length) sections.push({ title: '今天', items: today });
+  if (yesterday.length) sections.push({ title: '昨天', items: yesterday });
+  if (last7.length) sections.push({ title: '近一周', items: last7 });
+
+  const monthSections = Array.from(byMonth.values()).sort((a, b) => {
+    if (a.year !== b.year) return b.year - a.year;
+    return b.month - a.month; // 月份倒序，如 10月 在 9月 之前
+  });
+  sections.push(...monthSections);
+
+  return sections;
+});
+
+const clearAllHistory = () => {
+  searchHistory.value = [];
+  uni.setStorageSync('search_history', []);
+};
+
 // 发送消息
 const sendMessage = () => {
   if (inputMessage.value.trim() === "" || isSending.value) return;
@@ -904,7 +970,7 @@ const onBackTopClick = () => {
 
 .section-title {
   display: block;
-  text-align: center;
+  text-align: left;
   font-size: 26rpx;
   color: #666666;
   margin-bottom: 20rpx;
@@ -959,9 +1025,10 @@ const onBackTopClick = () => {
   margin-bottom: 30rpx;
 }
 
-/* .user-message {
+.user-message {
   flex-direction: row-reverse;
-} */
+  justify-content: flex-start;
+}
 
 .message-icon {
   font-size: 24rpx;
@@ -977,16 +1044,14 @@ const onBackTopClick = () => {
 }
 
 .user-message .message-icon {
-  background-color: transparent;
-  border-radius: 40rpx;
-  /* padding: 0;
-  width: auto;
-  height: auto; */
-  color: #333;
+  background-color: #007aff;
+  border-radius: 50%;
+  color: #fff;
+  /* box-shadow: 0 0 12rpx rgba(0, 122, 255, 0.4); */
 }
 
 .bot-message .message-icon {
-  background: url("https://d31zlh4on95l9h.cloudfront.net/images/61fa384381c88ad80be28f41827fe0e5.svg");
+  background: url('https://d31zlh4on95l9h.cloudfront.net/images/e723171126bd31c52137709ebbd1a7ea.svg');
 
   color: white;
 }
@@ -997,9 +1062,10 @@ const onBackTopClick = () => {
 }
 
 .user-message .message-content {
-  background-color: #007aff;
-  border-radius: 10rpx;
-  padding: 15rpx;
+  /* background-color: #007aff; */
+  border: 2rpx solid #f3908f;
+  border-radius: 20rpx;
+  padding: 10rpx;
 }
 
 .bot-message .message-content {
@@ -1014,7 +1080,7 @@ const onBackTopClick = () => {
 }
 
 .user-message .message-text {
-  color: white;
+  color:black;
 }
 
 .bot-message .message-text {
@@ -1204,45 +1270,87 @@ const onBackTopClick = () => {
 
 .drawer-panel {
   position: fixed;
-  top: 0;
+  left: 0;
   right: 0;
   bottom: 0;
-  width: 600rpx;
-  max-width: 75%;
+  height: 75vh;
+  max-height: 80vh;
+  width: 100%;
   background: #ffffff;
-  box-shadow: -8rpx 0 20rpx rgba(0, 0, 0, 0.08);
-  z-index: 901;
+  box-shadow: 0 -8rpx 20rpx rgba(0, 0, 0, 0.06);
+  z-index: 1000;
   display: flex;
   flex-direction: column;
-  transition: transform 0.2s ease;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+  transition: transform 0.22s ease;
 }
 
 .drawer-back {
   position: absolute;
-  left: -14px;
-  top: 50%;
-  transform: translateY(-50%);
+  left: 50%;
+  top: -14px;
+  transform: translateX(-50%);
   width: 28px;
-  height: 28px;
-  border-radius: 14px;
+  height: 48px;
+  border-radius: 12px;
   background: #fff;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
-  border: 1px solid #eee;
+  box-shadow: 0 2px 10px rgba(0,0,0,0.08);
   display: flex;
   align-items: center;
   justify-content: center;
 }
 .drawer-back-icon {
   font-size: 16px;
-  color: #666;
+  color: #8a8a8a;
+}
+
+.drawer-actions {
+  display: flex;
+  align-items: center;
+  gap: 40rpx;
+}
+
+.delete-all-container {
+  display: flex;
+  align-items: center;
+  gap: 14rpx;
+}
+
+
+
+.delete-icon {
+  width: 45rpx;
+  height: 40rpx;
+}
+
+.delete-all {
+  font-size: 28rpx;
+}
+
+.drawer-close {
+  background: url('https://d31zlh4on95l9h.cloudfront.net/images/444fbe3218954f3f907664c91025c4e4.svg');
+  width: 48rpx;
+  height: 48rpx;
+  border-radius: 24rpx;
+  /* background: #f5f5f5; */
+  /* box-shadow: 0 2px 8px rgba(0,0,0,0.08); */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.drawer-close-icon {
+  font-size: 24rpx;
+  color: #8a8a8a;
 }
 
 .drawer-header {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 24rpx 28rpx;
-  border-bottom: 2rpx solid #f0f0f0;
+  padding: 52rpx 28rpx 0rpx 28rpx;
+  /* border-bottom: 2rpx solid #f0f0f0; */
 }
 
 .drawer-title {
@@ -1258,7 +1366,62 @@ const onBackTopClick = () => {
 
 .drawer-content {
   flex: 1;
-  padding: 20rpx 24rpx;
+  min-height: 0; /* 让 flex 子元素可在容器内收缩以启用滚动 */
+  height: 100%;
+  overscroll-behavior-y: contain; /* 防止滚动串联到页面 */
+  -webkit-overflow-scrolling: touch; /* iOS 惯性滚动 */
+  touch-action: pan-y; /* 优化触控滚动，仅垂直 */
+}
+
+.drawer-inner {
+  padding: 20rpx 24rpx 20rpx 24rpx;
+}
+
+.history-section { 
+  margin-bottom: 20rpx; 
+  /* margin: 0 24rpx; */
+}
+
+.section-title {
+  font-size: 26rpx;
+  color: #888;
+  margin: 10rpx 6rpx 16rpx;
+}
+
+.history-item {
+  display: flex;
+  align-items: center;
+  padding: 19rpx 18rpx;
+  background-color: #f6f7f9;
+  border-radius: 12rpx;
+  margin-bottom: 12rpx;
+}
+
+.history-left { margin-right: 12rpx; }
+
+.flag-circle {
+  width: 36rpx;
+  height: 36rpx;
+  border-radius: 50%;
+  background: #fff;
+  border: 2rpx solid #eee;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.flag-emoji { font-size: 24rpx; }
+
+.history-main { flex: 1; }
+
+.history-query {
+  font-size: 28rpx;
+  color: #333;
+}
+
+.history-time {
+  font-size: 22rpx;
+  color: #999;
 }
 
 .history-card {