feat: add file upload failure handling and alert message

* fix: loading chat history for potential empty attachments

* chore: update release notes

.env

@@ -1,3 +1,5 @@
-COCO_SERVER_URL=https://coco.infini.cloud  #http://localhost:9000
+COCO_SERVER_URL=http://localhost:9000 #https://coco.infini.cloud  #http://localhost:9000
 
-COCO_WEBSOCKET_URL=wss://coco.infini.cloud/ws #ws://localhost:9000/ws
+COCO_WEBSOCKET_URL=ws://localhost:9000/ws #wss://coco.infini.cloud/ws #ws://localhost:9000/ws
+
+#TAURI_DEV_HOST=0.0.0.0

.github/workflows/release.yml

@@ -50,6 +50,8 @@ jobs:
 
           - platform: "ubuntu-22.04"
             target: "x86_64-unknown-linux-gnu"
+          - platform: "ubuntu-22.04-arm"
+            target: "aarch64-unknown-linux-gnu"
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -67,10 +69,10 @@ jobs:
         run: rustup target add ${{ matrix.target }}
 
       - name: Install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04'
+        if: startsWith(matrix.platform, 'ubuntu-22.04')
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf xdg-utils
 
       - name: Install Rust stable
         run: rustup toolchain install stable

.gitignore

@@ -25,3 +25,4 @@ src/components/web
 *.njsproj
 *.sln
 *.sw?
+.env

.vscode/settings.json

@@ -11,10 +11,12 @@
     "dtolnay",
     "dyld",
     "elif",
+    "errmsg",
     "fullscreen",
     "headlessui",
     "Icdbb",
     "icns",
+    "iconfont",
     "INFINI",
     "infinilabs",
     "inputbox",
@@ -57,6 +59,7 @@
     "uuidv",
     "VITE",
     "walkdir",
+    "wavesurfer",
     "webviews",
     "xzvf",
     "yuque",

Makefile

@@ -76,3 +76,6 @@ clean-rebuild:
 	@echo "Cleaning up and rebuilding..."
 	rm -rf node_modules
 	$(MAKE) dev-build
+
+add-dep-pizza-engine:
+	cd src-tauri && cargo add --git ssh://git@github.com/infinilabs/pizza.git pizza-engine --features query_string_parser,persistence

README.md

@@ -1,7 +1,15 @@
 # Coco AI - Connect & Collaborate
 
+<div align="center">
+
 **Tagline**: _"Coco AI - search, connect, collaborate – all in one place."_
 
+Visit our website: [https://coco.rs](https://coco.rs)
+
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) [![Tauri 2.0](https://img.shields.io/badge/Tauri-2.0-blue)](https://tauri.app/) [![React](https://img.shields.io/badge/React-18-blue)](https://react.dev/) [![TypeScript](https://img.shields.io/badge/TypeScript-5-blue)](https://www.typescriptlang.org/) [![Rust](https://img.shields.io/badge/Rust-latest-orange)](https://www.rust-lang.org/) [![Node](https://img.shields.io/badge/Node-%3E%3D18.12-green)](https://nodejs.org/) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/infinilabs/coco-app/pulls) [![Version](https://img.shields.io/github/v/release/infinilabs/coco-app)](https://github.com/infinilabs/coco-app/releases) [![Build Status](https://img.shields.io/github/actions/workflow/status/infinilabs/coco-app/ci.yml)](https://github.com/infinilabs/coco-app/actions) [![Discord](https://img.shields.io/discord/1122384609359966313)](https://discord.com/invite/4tKTMkkvVX)
+
+</div>
+
 Coco AI is a unified search platform that connects all your enterprise applications and data—Google Workspace, Dropbox,
 Confluent Wiki, GitHub, and more—into a single, powerful search interface. This repository contains the **Coco App**,
 built for both **desktop and mobile**. The app allows users to search and interact with their enterprise data across
@@ -12,16 +20,15 @@ and internal resources. Coco enhances collaboration by making information instan
 insights based on your enterprise's specific data.
 
 > **Note**: Backend services, including data indexing and search functionality, are handled in a
-> separate [repository](https://github.com/infinilabs/coco-server).
+separate [repository](https://github.com/infinilabs/coco-server).
 
-## Vision
+![Coco AI](./docs/static/img/coco-preview.gif)
 
-At Coco AI, we aim to streamline workplace collaboration by centralizing access to enterprise data. The Coco
-App
-provides a seamless, cross-platform experience, enabling teams to easily search, connect, and collaborate within their
-workspace.
+## 🚀 Vision
 
-## Use Cases
+At Coco AI, we aim to streamline workplace collaboration by centralizing access to enterprise data. The Coco App provides a seamless, cross-platform experience, enabling teams to easily search, connect, and collaborate within their workspace.
+
+## 💡 Use Cases
 
 - **Unified Search Across Platforms**: Coco integrates with all your enterprise apps, letting you search documents,
   conversations, and files across Google Workspace, Dropbox, GitHub, etc.
@@ -32,37 +39,73 @@ workspace.
 - **Simplified Data Access**: By removing the friction between various tools, Coco enhances your workflow and increases
   productivity.
 
-## Getting Started
+## ✨ Key Features
 
-### Initial Setup
+- 🔍 **Unified Search**: One-stop enterprise search with multi-platform integration
+  - Supports major collaboration platforms: Google Workspace, Dropbox, Confluence Wiki, GitHub, etc.
+  - Real-time search across documents, conversations, and files
+  - Smart search intent understanding with relevance ranking
+  - Cross-platform data correlation and context display
+- 🤖 **AI-Powered Chat**: Team-specific ChatGPT-like assistant trained on your enterprise data
+- 🌐 **Cross-Platform**: Available for Windows, macOS, Linux and Web
+- 🔒 **Security-First**: Support for private deployment and data sovereignty
+- ⚡ **High Performance**: Built with Rust and Tauri 2.0
+- 🎨 **Modern UI**: Sleek interface designed for productivity
 
-**This version of pnpm requires at least Node.js v18.12**
+## 🛠️ Technology Stack
 
-To set up the Coco App for development:
+- **Frontend**: React + TypeScript
+- **Desktop Framework**: Tauri 2.0
+- **Styling**: Tailwind CSS
+- **State Management**: Zustand
+- **Build Tool**: Vite
+
+## 🚀 Getting Started
+
+### Prerequisites
+
+- Node.js >= 18.12
+- Rust (latest stable)
+- pnpm (package manager)
+
+### Development Setup
 
 ```bash
-cd coco-app
+# Install pnpm
 npm install -g pnpm
+
+# Install dependencies
 pnpm install
+
+# Start development server
 pnpm tauri dev
 ```
 
-#### Desktop Development:
-
-To start desktop development, run:
+### Production Build
 
 ```bash
-pnpm tauri dev
+pnpm tauri build
 ```
 
-## Documentation
+## 📚 Documentation
 
-For full documentation on Coco AI, please visit the [Coco AI Documentation](https://docs.infinilabs.com/coco-app/main/).
+- [Coco App Documentation](https://docs.infinilabs.com/coco-app/main/)
+- [Coco Server Documentation](https://docs.infinilabs.com/coco-server/main/)
+- [Tauri Documentation](https://tauri.app/)
 
-## License
+## Contributors
 
-Coco AI is an open-source project licensed under
-the [MIT License](https://github.com/infinilabs/coco-app/blob/main/LICENSE).
+<a href="https://github.com/infinilabs/coco-app/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=infinilabs/coco-app" />
+</a>
 
-This means that you can freely use, modify, and
-distribute the software for both personal and commercial purposes, including hosting it on your own servers.
+## 📄 License
+
+Coco AI is an open-source project licensed under the [MIT License](LICENSE). You can freely use, modify, and
+distribute the software for both personal and commercial purposes, including hosting it on your own servers.
+
+---
+
+<div align="center">
+Built with ❤️ by <a href="https://infinilabs.com">INFINI Labs</a>
+</div>

docs/content.en/_index.md

@@ -7,8 +7,7 @@ type: docs
 
 Coco AI is a fully open-source, cross-platform unified search and productivity tool that connects and searches across various data sources, including applications, files, Google Drive, Notion, Yuque, Hugo, and more, both local and cloud-based. By integrating with large models like DeepSeek, Coco AI enables intelligent personal knowledge management, emphasizing privacy and supporting private deployment, helping users quickly and intelligently access their information.
 
-{{% load-img "/img/screenshot/fusion-search-across-datasources.png" "" %}}
-{{% load-img "/img/screenshot/coco-chat.png" "" %}}
+{{% load-img "/img/coco-preview.gif" "" %}}
 
 For more details on Coco Server, visit: [https://docs.infinilabs.com/coco-app/](https://docs.infinilabs.com/coco-app/).
 

docs/content.en/docs/_index.md

@@ -7,8 +7,7 @@ type: docs
 
 Coco AI is a fully open-source, cross-platform unified search and productivity tool that connects and searches across various data sources, including applications, files, Google Drive, Notion, Yuque, Hugo, and more, both local and cloud-based. By integrating with large models like DeepSeek, Coco AI enables intelligent personal knowledge management, emphasizing privacy and supporting private deployment, helping users quickly and intelligently access their information.
 
-{{% load-img "/img/screenshot/fusion-search-across-datasources.png" "" %}}
-{{% load-img "/img/screenshot/coco-chat.png" "" %}}
+{{% load-img "/img/coco-preview.gif" "" %}}
 
 For more details on Coco Server, visit: [https://docs.infinilabs.com/coco-app/](https://docs.infinilabs.com/coco-app/).
 

docs/content.en/docs/getting-started/installation/ubuntu.md

@@ -0,0 +1,38 @@
+---
+weight: 10
+title: "Ubuntu"
+asciinema: true
+---
+
+# Ubuntu
+
+> NOTE: Coco app only works fully under [X11][x11_protocol].
+>
+> Don't know if you running X11 or not? take a look at this [question][if_x11]!
+
+[x11_protocol]: https://en.wikipedia.org/wiki/X_Window_System 
+[if_x11]: https://unix.stackexchange.com/q/202891/498440
+
+
+## Goto [https://coco.rs/](https://coco.rs/)
+
+## Download the package
+
+Download the package of your architecture, it should be put in your `Downloads` directory 
+and look like this:
+
+```sh
+$ cd ~/Downloads
+$ ls 
+Coco-AI-x.y.z-bbbb-deb-linux-amd64.zip 
+# or Coco-AI-x.y.z-bbbb-deb-linux-arm64.zip depending on your architecture
+```
+
+## Install it
+   
+Unzip and install it
+
+```
+$ unzip Coco-AI-x.y.z-bbbb-deb-linux-amd64.zip 
+$ sudo dpkg -i Coco-AI-x.y.z-bbbb-deb-linux-amd64.deb 
+```

docs/content.en/docs/release-notes/_index.md

@@ -9,23 +9,101 @@ Information about release notes of Coco Server is provided here.
 
 ## Latest (In development)
 
+### ❌ Breaking changes
+
+### 🚀 Features
+
+- feat: check or enter to close the list of assistants #469
+- feat: add dimness settings for pinned window #470
+- feat: supports Shift + Enter input box line feeds #472
+- feat: support for snapshot version updates #480
+- feat: history list add put away button #482
+- feat: the chat input box supports multi-line input #490
+- feat: add `~/Applications` to the search path #493
+- feat: the chat content has added a button to return to the bottom #495
+- feat: the search input box supports multi-line input #501
+- feat: websocket support self-signed TLS #504
+- feat: add option to allow self-signed certificates #509
+
+### 🐛 Bug fix
+
+- fix: several issues around search #502
+- fix: fixed the newly created session has no title when it is deleted #511
+- fix: loading chat history for potential empty attachments
+
+### ✈️ Improvements
+
+- chore: adjust list error message #475
+- fix: solve the problem of modifying the assistant in the chat #476
+- chore: refine wording on search failure
+- chore：search and MCP show hidden logic #494
+- chore: greetings show hidden logic #496
+- refactor: fetch app list in settings in real time #498
+- chore: UpdateApp component loading location #499
+- chore: add clear monitoring & cache calculation to optimize performance #500
+- refactor: optimizing the code #505
+- refactor: optimized the modification operation of the numeric input box #508
+- style: modify the style of the search input box #513
+- style: chat input icons show #515
+
+## 0.4.0 (2025-04-27)
+
 ### Breaking changes
 
 ### Features
 
+- feat: history support for searching, renaming and deleting #322
+- feat: linux support for application search #330
+- feat: add shortcuts to most icon buttons #334
+- feat: add font icon for search list #342
+- feat: add a border to the main window in Windows 10 #343
+- feat: mobile terminal adaptation about style #348
+- feat: service list popup box supports keyboard-only operation #359
+- feat: networked search data sources support search and keyboard-only operation #367
+- feat: add application management to the plugin #374
+- feat: add keyboard-only operation to history list #385
+- feat: add error notification #386
+- feat: add support for AI assistant #394
+- feat: add support for calculator function #399
+- feat: auto selects the first item after searching #411
+- feat: web components assistant #422
+- feat: right-click menu support for search #423
+- feat: add chat mode launch page #424
+- feat: add MCP & call LLM tools #430
+- feat: ai assistant supports search and paging #431
+- feat: data sources support displaying customized icons #432
+- feat: add shortcut key conflict hint and reset function #442
+- feat: updated to include error message #465
+
 ### Bug fix
 
+- fix: fixed the problem of not being able to search in secondary directories #338
+- fix: active shadow setting #354
+- fix: chat history was not show up #377
+- fix: get attachments in chat sessions
+- fix: filter http query_args and convert only supported values
+- fix：fixed several search & chat bugs #412
+- fix: fixed carriage return problem with chinese input method #464
+
 ### Improvements
 
+- refactor: web components #331
+- refactor: refactoring login callback, receive access_token from coco-server
+- chore: adjust web component styles #362
+- style: modify the style #370
+- style: search list details display #378
+- refactor: refactoring api error handling #382
+- chore: update assistant icon & think mode #397
+- build: build web components and publish #404
+
 ## 0.3.0 (2025-03-31)
 
 ### Breaking changes
 
-- feat: add web pages components #277
-- feat: support for customizing some of the preset shortcuts #316
-
 ### Features
 
+- feat: add web pages components #277
+- feat: support for customizing some of the preset shortcuts #316
 - feat: support multi websocket connections #314
 - feat: add support for embeddable web widget #277
 
@@ -55,10 +133,10 @@ Information about release notes of Coco Server is provided here.
 ### Improvements
 
 - Refactor: chat components #273
-- Feat：add endpoint display #282
+- Feat: add endpoint display #282
 - Chore: chat window min width & remove input bg #284
 - Chore: remove selected function & add hide_coco #286
-- Chore：websocket timeout increased to 2 minutes #289
+- Chore: websocket timeout increased to 2 minutes #289
 - Chore: remove chat input border & clear input #295
 
 ## 0.2.0 (2025-03-07)

index.html

@@ -7,7 +7,7 @@
     <title>Coco</title>
   </head>
 
-  <body>
+  <body class="coco-container">
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>

package.json

@@ -1,13 +1,13 @@
 {
   "name": "coco",
   "private": true,
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
-    "build:web": "tsc && tsup",
-    "publish:web": "cd dist/search-chat && npm publish",
+    "build:web": "cross-env BUILD_TARGET=web tsc && cross-env BUILD_TARGET=web tsup --format esm",
+    "publish:web": "cd out/search-chat && npm publish",
     "publish:web:beta": "cd dist/search-chat && npm publish --tag beta",
     "publish:web:alpha": "cd dist/search-chat && npm publish --tag alpha",
     "publish:web:rc": "cd dist/search-chat && npm publish --tag rc",
@@ -19,34 +19,37 @@
   },
   "dependencies": {
     "@ant-design/icons": "^6.0.0",
-    "@headlessui/react": "^2.2.0",
-    "@tauri-apps/api": "^2.4.0",
+    "@headlessui/react": "^2.2.2",
+    "@tauri-apps/api": "^2.5.0",
     "@tauri-apps/plugin-autostart": "~2.2.0",
-    "@tauri-apps/plugin-deep-link": "^2.2.0",
-    "@tauri-apps/plugin-dialog": "^2.2.0",
+    "@tauri-apps/plugin-deep-link": "^2.2.1",
+    "@tauri-apps/plugin-dialog": "^2.2.1",
     "@tauri-apps/plugin-global-shortcut": "~2.0.0",
     "@tauri-apps/plugin-http": "~2.0.2",
+    "@tauri-apps/plugin-log": "~2.4.0",
     "@tauri-apps/plugin-os": "^2.2.1",
-    "@tauri-apps/plugin-process": "^2.2.0",
-    "@tauri-apps/plugin-shell": "^2.2.0",
-    "@tauri-apps/plugin-updater": "^2.6.1",
+    "@tauri-apps/plugin-process": "^2.2.1",
+    "@tauri-apps/plugin-shell": "^2.2.1",
+    "@tauri-apps/plugin-updater": "github:infinilabs/tauri-plugin-updater#v2",
     "@tauri-apps/plugin-websocket": "~2.3.0",
     "@tauri-apps/plugin-window": "2.0.0-alpha.1",
-    "@wavesurfer/react": "^1.0.9",
+    "@wavesurfer/react": "^1.0.11",
     "ahooks": "^3.8.4",
+    "axios": "^1.9.0",
     "clsx": "^2.1.1",
-    "dotenv": "^16.4.7",
+    "dayjs": "^1.11.13",
+    "dotenv": "^16.5.0",
     "filesize": "^10.1.6",
     "i18next": "^23.16.8",
-    "i18next-browser-languagedetector": "^8.0.4",
+    "i18next-browser-languagedetector": "^8.1.0",
     "lodash-es": "^4.17.21",
     "lucide-react": "^0.461.0",
-    "mermaid": "^11.5.0",
+    "mermaid": "^11.6.0",
     "nanoid": "^5.1.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-hotkeys-hook": "^4.6.1",
-    "react-i18next": "^15.4.1",
+    "react-hotkeys-hook": "^4.6.2",
+    "react-i18next": "^15.5.1",
     "react-markdown": "^9.1.0",
     "react-router-dom": "^6.30.0",
     "react-window": "^1.8.11",
@@ -55,33 +58,36 @@
     "remark-breaks": "^4.0.0",
     "remark-gfm": "^4.0.1",
     "remark-math": "^6.0.0",
-    "tauri-plugin-fs-pro-api": "^2.3.1",
-    "tauri-plugin-macos-permissions-api": "^2.2.0",
-    "tauri-plugin-screenshots-api": "^2.1.0",
+    "tauri-plugin-fs-pro-api": "^2.4.0",
+    "tauri-plugin-macos-permissions-api": "^2.3.0",
+    "tauri-plugin-screenshots-api": "^2.2.0",
+    "tauri-plugin-windows-version-api": "^2.0.0",
     "use-debounce": "^10.0.4",
     "uuid": "^11.1.0",
-    "wavesurfer.js": "^7.9.3",
-    "zustand": "^5.0.3"
+    "wavesurfer.js": "^7.9.5",
+    "zustand": "^5.0.4"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^2.4.0",
+    "@tauri-apps/cli": "^2.5.0",
     "@types/dom-speech-recognition": "^0.0.4",
     "@types/lodash-es": "^4.17.12",
     "@types/markdown-it": "^14.1.2",
-    "@types/node": "^22.13.11",
-    "@types/react": "^18.3.19",
-    "@types/react-dom": "^18.3.5",
+    "@types/node": "^22.15.17",
+    "@types/react": "^18.3.21",
+    "@types/react-dom": "^18.3.7",
     "@types/react-katex": "^3.0.4",
     "@types/react-window": "^1.8.8",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.4.1",
     "autoprefixer": "^10.4.21",
+    "cross-env": "^7.0.3",
     "immer": "^10.1.1",
     "postcss": "^8.5.3",
     "release-it": "^18.1.2",
+    "sass": "^1.87.0",
     "tailwindcss": "^3.4.17",
     "tsup": "^8.4.0",
-    "tsx": "^4.19.3",
-    "typescript": "^5.8.2",
-    "vite": "^5.4.14"
+    "tsx": "^4.19.4",
+    "typescript": "^5.8.3",
+    "vite": "^5.4.19"
   }
 }

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "coco"
-version = "0.3.0"
+version = "0.4.0"
 description = "Search, connect, collaborate – all in one place."
 authors = ["INFINI Labs"]
 edition = "2021"
@@ -20,6 +20,26 @@ tauri-build = { version = "2", features = ["default"] }
 default = ["desktop"]
 desktop = []
 cargo-clippy = []
+# If enabled, code that relies on pizza_engine will be activated.
+#
+# Only do this if:
+# 1. Pizza engine is listed in the `dependencies` section
+#  
+# ```toml
+# [dependencies]
+# pizza-engine = { git = "ssh://git@github.com/infinilabs/pizza.git", features = ["query_string_parser", "persistence"] }
+# ```
+#
+# 2. It is a private repo, you have access to it.
+#
+# So, for external contributors, do NOT enable this feature.
+# 
+# Previously, We listed it in the dependencies and marked it optional, but cargo 
+# would fetch all the dependencies regardless of wheterh they are optional or not, 
+# so we removed it.
+#
+# https://github.com/rust-lang/cargo/issues/4544#issuecomment-1906902755
+use_pizza_engine = []
 
 [dependencies]
 pizza-common = { git = "https://github.com/infinilabs/pizza-common", branch = "main" }
@@ -27,7 +47,9 @@ pizza-common = { git = "https://github.com/infinilabs/pizza-common", branch = "m
 tauri = { version = "2", features = ["protocol-asset", "macos-private-api", "tray-icon", "image-ico", "image-png", "unstable"] }
 tauri-plugin-shell = "2"
 serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+# Need `arbitrary_precision` feature to support storing u128
+# see: https://docs.rs/serde_json/latest/serde_json/struct.Number.html#method.from_u128
+serde_json = { version = "1", features = ["arbitrary_precision"] }
 tauri-plugin-http = "2"
 tauri-plugin-websocket = "2"
 tauri-plugin-deep-link = "2.0.0"
@@ -35,17 +57,15 @@ tauri-plugin-store = "2.2.0"
 tauri-plugin-os = "2"
 tauri-plugin-dialog = "2"
 tauri-plugin-fs = "2"
-tauri-plugin-updater = "2"
 tauri-plugin-process = "2"
 tauri-plugin-drag = "2"
 tauri-plugin-macos-permissions = "2"
 tauri-plugin-fs-pro = "2"
 tauri-plugin-screenshots = "2"
-applications = "0.3.0"
-
+applications = { git = "https://github.com/infinilabs/applications-rs", rev = "7bb507e6b12f73c96f3a52f0578d0246a689f381" }
 tokio-native-tls = "0.3"  # For wss connections
 tokio = { version = "1", features = ["full"] }
-tokio-tungstenite = { version = "0.20", features = ["rustls-tls-webpki-roots"] }
+tokio-tungstenite = { version = "0.20", features = ["native-tls"] }
 hyper = { version = "0.14", features = ["client"] }
 reqwest = { version = "0.12", features = ["json", "multipart"] }
 futures = "0.3.31"
@@ -60,15 +80,19 @@ hostname = "0.3"
 plist = "1.7"
 base64 = "0.13"
 walkdir = "2"
-fuzzy_prefix_search = "0.2"
 log = "0.4"
 
 futures-util = "0.3.31"
 url = "2.5.2"
 http = "1.1.0"
 tungstenite = "0.24.0"
-env_logger = "0.11.5"
 tokio-util = "0.7.14"
+tauri-plugin-windows-version = "2"
+meval = "0.2"
+chinese-number = "0.7"
+num2words = "1"
+tauri-plugin-log = "2"
+chrono = "0.4.41"
 
 [target."cfg(target_os = \"macos\")".dependencies]
 tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2" }
@@ -76,7 +100,6 @@ tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2"
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
 tauri-plugin-single-instance = { version = "2.0.0", features = ["deep-link"] }
 
-
 [profile.dev]
 incremental = true # Compile your binary in smaller steps.
 
@@ -90,4 +113,7 @@ strip = true # Ensures debug symbols are removed.
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-autostart = "^2.2"
 tauri-plugin-global-shortcut = "2"
-tauri-plugin-updater = "2"
+tauri-plugin-updater = { git = "https://github.com/infinilabs/plugins-workspace", branch = "v2" }
+
+[target."cfg(target_os = \"windows\")".dependencies]
+enigo="0.3"

src-tauri/capabilities/default.json

@@ -29,6 +29,7 @@
     "core:window:allow-set-focus",
     "core:window:allow-set-always-on-top",
     "core:window:deny-internal-toggle-maximize",
+    "core:window:allow-set-shadow",
     "core:app:allow-set-app-theme",
     "shell:default",
     "http:default",
@@ -68,6 +69,8 @@
     "screenshots:default",
     "core:window:allow-set-theme",
     "process:default",
-    "updater:default"
+    "updater:default",
+    "windows-version:default",
+    "log:default"
   ]
 }

src-tauri/rust-toolchain.toml

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly-2024-10-29"

src-tauri/src/assistant/mod.rs

@@ -1,7 +1,7 @@
+use crate::common;
 use crate::common::assistant::ChatRequestMessage;
 use crate::common::http::GetResponse;
 use crate::server::http_client::HttpClient;
-use reqwest::Response;
 use serde_json::Value;
 use std::collections::HashMap;
 use tauri::{AppHandle, Runtime};
@@ -12,6 +12,7 @@ pub async fn chat_history<R: Runtime>(
     server_id: String,
     from: u32,
     size: u32,
+    query: Option<String>,
 ) -> Result<String, String> {
     let mut query_params: HashMap<String, Value> = HashMap::new();
     if from > 0 {
@@ -21,25 +22,20 @@ pub async fn chat_history<R: Runtime>(
         query_params.insert("size".to_string(), size.into());
     }
 
+    if let Some(query) = query {
+        if !query.is_empty() {
+            query_params.insert("query".to_string(), query.into());
+        }
+    }
+
     let response = HttpClient::get(&server_id, "/chat/_history", Some(query_params))
         .await
-        .map_err(|e| format!("Error get sessions: {}", e))?;
+        .map_err(|e| {
+            dbg!("Error get history: {}", &e);
+            format!("Error get history: {}", e)
+        })?;
 
-    handle_raw_response(response).await?
-}
-
-async fn handle_raw_response(response: Response) -> Result<Result<String, String>, String> {
-    Ok(
-        if response.status().as_u16() < 200 || response.status().as_u16() >= 400 {
-            Err("Failed to send message".to_string())
-        } else {
-            let body = response
-                .text()
-                .await
-                .map_err(|e| format!("Failed to parse response JSON: {}", e))?;
-            Ok(body)
-        },
-    )
+    common::http::get_response_body_text(response).await
 }
 
 #[tauri::command]
@@ -64,7 +60,7 @@ pub async fn session_chat_history<R: Runtime>(
         .await
         .map_err(|e| format!("Error get session message: {}", e))?;
 
-    handle_raw_response(response).await?
+    common::http::get_response_body_text(response).await
 }
 
 #[tauri::command]
@@ -80,7 +76,7 @@ pub async fn open_session_chat<R: Runtime>(
         .await
         .map_err(|e| format!("Error open session: {}", e))?;
 
-    handle_raw_response(response).await?
+    common::http::get_response_body_text(response).await
 }
 
 #[tauri::command]
@@ -96,7 +92,7 @@ pub async fn close_session_chat<R: Runtime>(
         .await
         .map_err(|e| format!("Error close session: {}", e))?;
 
-    handle_raw_response(response).await?
+    common::http::get_response_body_text(response).await
 }
 #[tauri::command]
 pub async fn cancel_session_chat<R: Runtime>(
@@ -111,7 +107,7 @@ pub async fn cancel_session_chat<R: Runtime>(
         .await
         .map_err(|e| format!("Error cancel session: {}", e))?;
 
-    handle_raw_response(response).await?
+    common::http::get_response_body_text(response).await
 }
 
 #[tauri::command]
@@ -120,14 +116,17 @@ pub async fn new_chat<R: Runtime>(
     server_id: String,
     websocket_id: String,
     message: String,
-    query_params: Option<HashMap<String, Value>>, //search,deep_thinking
+    query_params: Option<HashMap<String, Value>>,
 ) -> Result<GetResponse, String> {
     let body = if !message.is_empty() {
         let message = ChatRequestMessage {
             message: Some(message),
         };
-        let body = reqwest::Body::from(serde_json::to_string(&message).unwrap());
-        Some(body)
+        Some(
+            serde_json::to_string(&message)
+                .map_err(|e| format!("Failed to serialize message: {}", e))?
+                .into(),
+        )
     } else {
         None
     };
@@ -135,20 +134,16 @@ pub async fn new_chat<R: Runtime>(
     let mut headers = HashMap::new();
     headers.insert("WEBSOCKET-SESSION-ID".to_string(), websocket_id.into());
 
-    let response = HttpClient::advanced_post(&server_id, "/chat/_new", Some(headers), query_params, body)
-        .await
-        .map_err(|e| format!("Error sending message: {}", e))?;
+    let response =
+        HttpClient::advanced_post(&server_id, "/chat/_new", Some(headers), query_params, body)
+            .await
+            .map_err(|e| format!("Error sending message: {}", e))?;
 
-    if response.status().as_u16() < 200 || response.status().as_u16() >= 400 {
-        return Err("Failed to send message".to_string());
-    }
+    let body_text = common::http::get_response_body_text(response).await?;
 
-    let chat_response: GetResponse = response
-        .json()
-        .await
-        .map_err(|e| format!("Failed to parse response JSON: {}", e))?;
+    let chat_response: GetResponse =
+        serde_json::from_str(&body_text).map_err(|e| format!("Failed to parse response JSON: {}", e))?;
 
-    // Check the result and status fields
     if chat_response.result != "created" {
         return Err(format!("Unexpected result: {}", chat_response.result));
     }
@@ -174,10 +169,90 @@ pub async fn send_message<R: Runtime>(
     headers.insert("WEBSOCKET-SESSION-ID".to_string(), websocket_id.into());
 
     let body = reqwest::Body::from(serde_json::to_string(&msg).unwrap());
-    let response =
-        HttpClient::advanced_post(&server_id, path.as_str(), Some(headers), query_params, Some(body))
-            .await
-            .map_err(|e| format!("Error cancel session: {}", e))?;
+    let response = HttpClient::advanced_post(
+        &server_id,
+        path.as_str(),
+        Some(headers),
+        query_params,
+        Some(body),
+    )
+        .await
+        .map_err(|e| format!("Error cancel session: {}", e))?;
 
-    handle_raw_response(response).await?
+    common::http::get_response_body_text(response).await
+}
+
+#[tauri::command]
+pub async fn delete_session_chat(server_id: String, session_id: String) -> Result<bool, String> {
+    let response =
+        HttpClient::delete(&server_id, &format!("/chat/{}", session_id), None, None).await?;
+
+    if response.status().is_success() {
+        Ok(true)
+    } else {
+        Err(format!("Delete failed with status: {}", response.status()))
+    }
+}
+
+#[tauri::command]
+pub async fn update_session_chat(
+    server_id: String,
+    session_id: String,
+    title: Option<String>,
+    context: Option<HashMap<String, Value>>,
+) -> Result<bool, String> {
+    let mut body = HashMap::new();
+    if let Some(title) = title {
+        body.insert("title".to_string(), Value::String(title));
+    }
+    if let Some(context) = context {
+        body.insert(
+            "context".to_string(),
+            Value::Object(context.into_iter().collect()),
+        );
+    }
+
+    let response = HttpClient::put(
+        &server_id,
+        &format!("/chat/{}", session_id),
+        None,
+        None,
+        Some(reqwest::Body::from(serde_json::to_string(&body).unwrap())),
+    )
+        .await
+        .map_err(|e| format!("Error updating session: {}", e))?;
+
+    Ok(response.status().is_success())
+}
+
+#[tauri::command]
+pub async fn assistant_search<R: Runtime>(
+    _app_handle: AppHandle<R>,
+    server_id: String,
+    from: u32,
+    size: u32,
+    query: Option<HashMap<String, Value>>,
+) -> Result<Value, String> {
+    let mut body = serde_json::json!({
+        "from": from,
+        "size": size,
+    });
+
+    if let Some(q) = query {
+        body["query"] = serde_json::to_value(q).map_err(|e| e.to_string())?;
+    }
+
+    let response = HttpClient::post(
+        &server_id,
+        "/assistant/_search",
+        None,
+        Some(reqwest::Body::from(body.to_string())),
+    )
+    .await
+    .map_err(|e| format!("Error searching assistants: {}", e))?;
+
+    response
+        .json::<Value>()
+        .await
+        .map_err(|err| err.to_string())
 }

src-tauri/src/common/document.rs

@@ -29,7 +29,7 @@ pub struct EditorInfo {
     pub timestamp: Option<String>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct Document {
     pub id: String,
     pub created: Option<String>,
@@ -55,32 +55,3 @@ pub struct Document {
     pub owner: Option<UserInfo>,
     pub last_updated_by: Option<EditorInfo>,
 }
-impl Document {
-    pub fn new(source: Option<DataSourceReference>, id: String, category: String, name: String, url: String) -> Self {
-        Self {
-            id,
-            created: None,
-            updated: None,
-            source,
-            r#type: None,
-            category: Some(category),
-            subcategory: None,
-            categories: None,
-            rich_categories: None,
-            title: Some(name),
-            summary: None,
-            lang: None,
-            content: None,
-            icon: None,
-            thumbnail: None,
-            cover: None,
-            tags: None,
-            url: Some(url),
-            size: None,
-            metadata: None,
-            payload: None,
-            owner: None,
-            last_updated_by: None,
-        }
-    }
-}

src-tauri/src/common/error.rs

@@ -0,0 +1,45 @@
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+#[derive(Debug, Deserialize)]
+pub struct ErrorDetail {
+    pub reason: String,
+    pub status: u16,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ErrorResponse {
+    pub error: ErrorDetail,
+}
+
+#[derive(Debug, Error, Serialize)]
+pub enum SearchError {
+    #[error("HTTP request failed: {0}")]
+    HttpError(String),
+
+    #[error("Invalid response format: {0}")]
+    ParseError(String),
+
+    #[error("Timeout occurred")]
+    Timeout,
+
+    #[error("Unknown error: {0}")]
+    #[allow(dead_code)]
+    Unknown(String),
+
+    #[error("InternalError error: {0}")]
+    #[allow(dead_code)]
+    InternalError(String),
+}
+
+impl From<reqwest::Error> for SearchError {
+    fn from(err: reqwest::Error) -> Self {
+        if err.is_timeout() {
+            SearchError::Timeout
+        } else if err.is_decode() {
+            SearchError::ParseError(err.to_string())
+        } else {
+            SearchError::HttpError(err.to_string())
+        }
+    }
+}

src-tauri/src/common/http.rs

@@ -1,3 +1,5 @@
+use crate::common;
+use reqwest::Response;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
@@ -15,4 +17,36 @@ pub struct Source {
     pub created: String,
     pub updated: String,
     pub status: String,
+}
+
+pub async fn get_response_body_text(response: Response) -> Result<String, String> {
+    let status = response.status().as_u16();
+    let body = response
+        .text()
+        .await
+        .map_err(|e| format!("Failed to read response body: {}, code: {}", e, status))?;
+
+    log::debug!("Response status: {}, body: {}", status, &body);
+
+    if status < 200 || status >= 400 {
+        // Try to parse the error body
+        let fallback_error = "Failed to send message".to_string();
+
+        if body.trim().is_empty() {
+            return Err(fallback_error);
+        }
+
+        match serde_json::from_str::<common::error::ErrorResponse>(&body) {
+            Ok(parsed_error) => {
+                dbg!(&parsed_error);
+                Err(format!(
+                    "Server error ({}): {}",
+                    parsed_error.error.status, parsed_error.error.reason
+                ))
+            }
+            Err(_) => Err(fallback_error),
+        }
+    } else {
+        Ok(body)
+    }
 }

src-tauri/src/common/mod.rs

@@ -10,6 +10,7 @@ pub mod traits;
 pub mod register;
 pub mod assistant;
 pub mod http;
+pub mod error;
 
 pub static MAIN_WINDOW_LABEL: &str = "main";
 pub static SETTINGS_WINDOW_LABEL: &str = "settings";

src-tauri/src/common/profile.rs

@@ -1,15 +1,16 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug,Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Preferences {
-    pub theme: String,
-    pub language: String,
+    pub theme: Option<String>,
+    pub language: Option<String>,
 }
 
-#[derive(Debug,Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct UserProfile {
+    pub id: String,
     pub name: String,
     pub email: String,
-    pub avatar: String,
-    pub preferences: Preferences,
+    pub avatar: Option<String>,
+    pub preferences: Option<Preferences>,
 }

src-tauri/src/common/search.rs

@@ -1,9 +1,10 @@
 use crate::common::document::Document;
+use crate::common::http::get_response_body_text;
 use reqwest::Response;
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
 use std::collections::HashMap;
 use std::error::Error;
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct SearchResponse<T> {
     pub took: u64,
@@ -47,14 +48,11 @@ pub async fn parse_search_response<T>(
 where
     T: for<'de> Deserialize<'de> + std::fmt::Debug,
 {
-    let body = response
-        .json::<Value>()
-        .await
-        .map_err(|e| format!("Failed to parse JSON: {}", e))?;
+    let body_text = get_response_body_text(response).await?;
 
-    // dbg!(&body);
+    // dbg!(&body_text);
 
-    let search_response: SearchResponse<T> = serde_json::from_value(body)
+    let search_response: SearchResponse<T> = serde_json::from_str(&body_text)
         .map_err(|e| format!("Failed to deserialize search response: {}", e))?;
 
     Ok(search_response)

src-tauri/src/common/traits.rs

@@ -1,10 +1,8 @@
-use crate::common::search::{QueryResponse, QuerySource};
-use thiserror::Error;
-
-use async_trait::async_trait;
+use crate::common::error::SearchError;
 // use std::{future::Future, pin::Pin};
 use crate::common::search::SearchQuery;
-use serde::Serialize;
+use crate::common::search::{QueryResponse, QuerySource};
+use async_trait::async_trait;
 
 #[async_trait]
 pub trait SearchSource: Send + Sync {
@@ -13,34 +11,3 @@ pub trait SearchSource: Send + Sync {
     async fn search(&self, query: SearchQuery) -> Result<QueryResponse, SearchError>;
 }
 
-#[derive(Debug, Error, Serialize)]
-pub enum SearchError {
-    #[error("HTTP request failed: {0}")]
-    HttpError(String),
-
-    #[error("Invalid response format: {0}")]
-    ParseError(String),
-
-    #[error("Timeout occurred")]
-    Timeout,
-
-    #[error("Unknown error: {0}")]
-    #[allow(dead_code)]
-    Unknown(String),
-
-    #[error("InternalError error: {0}")]
-    #[allow(dead_code)]
-    InternalError(String),
-}
-
-impl From<reqwest::Error> for SearchError {
-    fn from(err: reqwest::Error) -> Self {
-        if err.is_timeout() {
-            SearchError::Timeout
-        } else if err.is_decode() {
-            SearchError::ParseError(err.to_string())
-        } else {
-            SearchError::HttpError(err.to_string())
-        }
-    }
-}

src-tauri/src/lib.rs

@@ -4,6 +4,7 @@ mod common;
 mod local;
 mod search;
 mod server;
+mod settings;
 mod setup;
 mod shortcut;
 mod util;
@@ -15,13 +16,15 @@ use crate::server::servers::{load_or_insert_default_server, load_servers_token};
 use autostart::{change_autostart, enable_autostart};
 use lazy_static::lazy_static;
 use std::sync::Mutex;
+use std::sync::OnceLock;
+use tauri::async_runtime::block_on;
+use tauri::plugin::TauriPlugin;
 #[cfg(target_os = "macos")]
 use tauri::ActivationPolicy;
 use tauri::{
     AppHandle, Emitter, Manager, PhysicalPosition, Runtime, WebviewWindow, Window, WindowEvent,
 };
 use tauri_plugin_autostart::MacosLauncher;
-use tokio::runtime::Runtime as RT;
 
 /// Tauri store name
 pub(crate) const COCO_TAURI_STORE: &str = "coco_tauri_store";
@@ -30,6 +33,10 @@ lazy_static! {
     static ref PREVIOUS_MONITOR_NAME: Mutex<Option<String>> = Mutex::new(None);
 }
 
+/// To allow us to access tauri's `AppHandle` when its context is inaccessible,
+/// store it globally. It will be set in `init()`.
+pub(crate) static GLOBAL_TAURI_APP_HANDLE: OnceLock<AppHandle> = OnceLock::new();
+
 #[tauri::command]
 async fn change_window_height(handle: AppHandle, height: u32) {
     let window: WebviewWindow = handle.get_webview_window(MAIN_WINDOW_LABEL).unwrap();
@@ -55,8 +62,6 @@ struct Payload {
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     let ctx = tauri::generate_context!();
-    // Initialize logger
-    env_logger::init();
 
     let mut app_builder = tauri::Builder::default();
 
@@ -82,7 +87,9 @@ pub fn run() {
         .plugin(tauri_plugin_macos_permissions::init())
         .plugin(tauri_plugin_screenshots::init())
         .plugin(tauri_plugin_process::init())
-        .plugin(tauri_plugin_updater::Builder::new().build());
+        .plugin(tauri_plugin_updater::Builder::new().build())
+        .plugin(tauri_plugin_windows_version::init())
+        .plugin(set_up_tauri_logger());
 
     // Conditional compilation for macOS
     #[cfg(target_os = "macos")]
@@ -110,7 +117,8 @@ pub fn run() {
             server::servers::disable_server,
             server::auth::handle_sso_callback,
             server::profile::get_user_profiles,
-            server::datasource::get_datasources_by_server,
+            server::datasource::datasource_search,
+            server::datasource::mcp_server_search,
             server::connector::get_connectors_by_server,
             search::query_coco_fusion,
             assistant::chat_history,
@@ -120,6 +128,9 @@ pub fn run() {
             assistant::open_session_chat,
             assistant::close_session_chat,
             assistant::cancel_session_chat,
+            assistant::delete_session_chat,
+            assistant::update_session_chat,
+            assistant::assistant_search,
             // server::get_coco_server_datasources,
             // server::get_coco_server_connectors,
             server::websocket::connect_to_server,
@@ -128,27 +139,42 @@ pub fn run() {
             server::attachment::upload_attachment,
             server::attachment::get_attachment,
             server::attachment::delete_attachment,
-            server::transcription::transcription
+            server::transcription::transcription,
+            util::open,
+            server::system_settings::get_system_settings,
+            simulate_mouse_click,
+            local::get_disabled_local_query_sources,
+            local::enable_local_query_source,
+            local::disable_local_query_source,
+            local::application::get_app_list,
+            local::application::get_app_search_path,
+            local::application::get_app_metadata,
+            local::application::set_app_alias,
+            local::application::register_app_hotkey,
+            local::application::unregister_app_hotkey,
+            local::application::disable_app_search,
+            local::application::enable_app_search,
+            local::application::add_app_search_path,
+            local::application::remove_app_search_path,
+            settings::set_allow_self_signature,
+            settings::get_allow_self_signature,
         ])
         .setup(|app| {
+            let app_handle = app.handle().clone();
+            GLOBAL_TAURI_APP_HANDLE
+                .set(app_handle.clone())
+                .expect("variable already initialized");
+
             let registry = SearchSourceRegistry::default();
 
             app.manage(registry); // Store registry in Tauri's app state
             app.manage(server::websocket::WebSocketManager::default());
 
-            // Get app handle
-            // let app_handle = app.handle().clone();
-
-            // Create a single Tokio runtime instance
-            let rt = RT::new().expect("Failed to create Tokio runtime");
-
-            // Use the runtime to spawn the async initialization tasks
-            let init_app_handle = app.handle().clone();
-            rt.spawn(async move {
-                init(&init_app_handle).await; // Pass a reference to `app_handle`
+            block_on(async {
+                init(app.handle()).await;
             });
 
-            shortcut::enable_shortcut(&app);
+            shortcut::enable_shortcut(app);
 
             enable_autostart(app);
 
@@ -232,29 +258,20 @@ pub async fn init<R: Runtime>(app_handle: &AppHandle<R>) {
         crate::server::servers::try_register_server_to_search_source(app_handle.clone(), &server)
             .await;
     }
-}
 
-async fn init_app_search_source<R: Runtime>(app_handle: &AppHandle<R>) -> Result<(), String> {
-    let application_search =
-        local::application::ApplicationSearchSource::new(app_handle.clone(), 1000f64).await?;
-
-    // Register the application search source
-    let registry = app_handle.state::<SearchSourceRegistry>();
-    registry.register_source(application_search).await;
-
-    Ok(())
+    local::start_pizza_engine_runtime();
 }
 
 #[tauri::command]
 async fn show_coco<R: Runtime>(app_handle: AppHandle<R>) {
     if let Some(window) = app_handle.get_window(MAIN_WINDOW_LABEL) {
-        let _ = app_handle.emit("show-coco", ());
-
         move_window_to_active_monitor(&window);
 
         let _ = window.show();
         let _ = window.unminimize();
         let _ = window.set_focus();
+
+        let _ = app_handle.emit("show-coco", ());
     }
 }
 
@@ -398,7 +415,7 @@ fn open_settings(app: &tauri::AppHandle) {
 
 #[tauri::command]
 async fn get_app_search_source<R: Runtime>(app_handle: AppHandle<R>) -> Result<(), String> {
-    init_app_search_source(&app_handle).await?;
+    local::init_local_search_source(&app_handle).await?;
     let _ = server::connector::refresh_all_connectors(&app_handle).await;
     let _ = server::datasource::refresh_all_datasources(&app_handle).await;
 
@@ -409,3 +426,98 @@ async fn get_app_search_source<R: Runtime>(app_handle: AppHandle<R>) -> Result<(
 async fn show_settings(app_handle: AppHandle) {
     open_settings(&app_handle);
 }
+
+#[tauri::command]
+async fn simulate_mouse_click<R: Runtime>(window: WebviewWindow<R>, is_chat_mode: bool) {
+    #[cfg(target_os = "windows")]
+    {
+        use enigo::{Button, Coordinate, Direction, Enigo, Mouse, Settings};
+        use std::{thread, time::Duration};
+
+        if let Ok(mut enigo) = Enigo::new(&Settings::default()) {
+            // Save the current mouse position
+            if let Ok((original_x, original_y)) = enigo.location() {
+                // Retrieve the window's outer position (top-left corner)
+                if let Ok(position) = window.outer_position() {
+                    // Retrieve the window's inner size (client area)
+                    if let Ok(size) = window.inner_size() {
+                        // Calculate the center position of the title bar
+                        let x = position.x + (size.width as i32 / 2);
+                        let y = if is_chat_mode {
+                            position.y + size.height as i32 - 50
+                        } else {
+                            position.y + 30
+                        };
+
+                        // Move the mouse cursor to the calculated position
+                        if enigo.move_mouse(x, y, Coordinate::Abs).is_ok() {
+                            // // Simulate a left mouse click
+                            let _ = enigo.button(Button::Left, Direction::Click);
+                            // let _ = enigo.button(Button::Left, Direction::Release);
+
+                            thread::sleep(Duration::from_millis(100));
+
+                            // Move the mouse cursor back to the original position
+                            let _ = enigo.move_mouse(original_x, original_y, Coordinate::Abs);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    {
+        let _ = window;
+        let _ = is_chat_mode;
+    }
+}
+
+/// Log format:
+///
+/// ```text
+/// [time] [log level] [file module:line] message
+/// ```
+///
+/// Example:
+///
+///
+/// ```text
+/// [05-11 17:00:00] [INF] [coco_lib:625] Coco-AI started
+/// ```
+fn set_up_tauri_logger() -> TauriPlugin<tauri::Wry> {
+    use log::Level;
+
+    fn format_log_level(level: Level) -> &'static str {
+        match level {
+            Level::Trace => "TRC",
+            Level::Debug => "DBG",
+            Level::Info => "INF",
+            Level::Warn => "WAR",
+            Level::Error => "ERR",
+        }
+    }
+
+    fn format_target_and_line(record: &log::Record) -> String {
+        let mut str = record.target().to_string();
+        if let Some(line) = record.line() {
+            str.push(':');
+            str.push_str(&line.to_string());
+        }
+
+        str
+    }
+
+    tauri_plugin_log::Builder::new()
+        .format(|out, message, record| {
+            let now = chrono::Local::now().format("%m-%d %H:%M:%S");
+            let level = format_log_level(record.level());
+            let target_and_line = format_target_and_line(record);
+            out.finish(format_args!(
+                "[{}] [{}] [{}] {}",
+                now, level, target_and_line, message
+            ));
+        })
+        .level(log::LevelFilter::Debug)
+        .build()
+}

src-tauri/src/local/application.rs

@@ -1,163 +0,0 @@
-use crate::common::document::{DataSourceReference, Document};
-use crate::common::search::{QueryResponse, QuerySource, SearchQuery};
-use crate::common::traits::{SearchError, SearchSource};
-use crate::local::LOCAL_QUERY_SOURCE_TYPE;
-use applications::{AppInfo, AppInfoContext};
-use async_trait::async_trait;
-use base64::encode;
-use fuzzy_prefix_search::Trie;
-use std::collections::HashMap;
-use std::fs;
-use std::path::{Path, PathBuf};
-use tauri::{AppHandle, Runtime};
-use tauri_plugin_fs_pro::{icon, name};
-
-pub struct ApplicationSearchSource {
-    base_score: f64,
-    icons: HashMap<String, PathBuf>,
-    application_paths: Trie<String>,
-}
-
-impl ApplicationSearchSource {
-    pub async fn new<R: Runtime>(
-        app_handle: AppHandle<R>,
-        base_score: f64,
-    ) -> Result<Self, String> {
-        let application_paths = Trie::new();
-        let mut icons = HashMap::new();
-
-        let mut ctx = AppInfoContext::new(vec![]);
-        ctx.refresh_apps().map_err(|err| err.to_string())?; // must refresh apps before getting them
-        let apps = ctx.get_all_apps();
-
-        for app in &apps {
-            if app.icon_path.is_none() {
-                continue;
-            }
-
-            let path = if cfg!(target_os = "macos") {
-                app.app_desktop_path.clone()
-            } else {
-                app.app_path_exe
-                    .clone()
-                    .unwrap_or(PathBuf::from("Path not found"))
-            };
-            let search_word = name(path.clone()).await;
-            let icon = icon(app_handle.clone(), path.clone(), Some(256))
-                .await
-                .map_err(|err| err.to_string())?;
-            let path_string = path.to_string_lossy().into_owned();
-
-            if search_word.is_empty() || search_word.eq("coco-ai") {
-                continue;
-            }
-
-            application_paths.insert(&search_word, path_string.clone());
-            icons.insert(path_string, icon);
-        }
-
-        Ok(ApplicationSearchSource {
-            base_score,
-            icons,
-            application_paths,
-        })
-    }
-}
-
-#[async_trait]
-impl SearchSource for ApplicationSearchSource {
-    fn get_type(&self) -> QuerySource {
-        QuerySource {
-            r#type: LOCAL_QUERY_SOURCE_TYPE.into(),
-            name: hostname::get()
-                .unwrap_or("My Computer".into())
-                .to_string_lossy()
-                .into(),
-            id: "local_applications".into(),
-        }
-    }
-
-    async fn search(&self, query: SearchQuery) -> Result<QueryResponse, SearchError> {
-        let query_string = query
-            .query_strings
-            .get("query")
-            .unwrap_or(&"".to_string())
-            .to_lowercase();
-
-        if query_string.is_empty() {
-            return Ok(QueryResponse {
-                source: self.get_type(),
-                hits: Vec::new(),
-                total_hits: 0,
-            });
-        }
-
-        let mut total_hits = 0;
-        let mut hits = Vec::new();
-
-        let mut results = self
-            .application_paths
-            .search_within_distance_scored(&query_string, 3);
-
-        // Check for NaN or extreme score values and handle them properly
-        results.sort_by(|a, b| {
-            // If either score is NaN, consider them equal (you can customize this logic as needed)
-            if a.score.is_nan() || b.score.is_nan() {
-                std::cmp::Ordering::Equal
-            } else {
-                // Otherwise, compare the scores as usual
-                b.score
-                    .partial_cmp(&a.score)
-                    .unwrap_or(std::cmp::Ordering::Equal)
-            }
-        });
-
-        if !results.is_empty() {
-            for result in results {
-                let file_name_str = result.word;
-                let file_path_str = result.data.get(0).unwrap().to_string();
-                let file_path = PathBuf::from(file_path_str.clone());
-                let cleaned_file_name = name(file_path).await;
-                total_hits += 1;
-                let mut doc = Document::new(
-                    Some(DataSourceReference {
-                        r#type: Some(LOCAL_QUERY_SOURCE_TYPE.into()),
-                        name: Some("Applications".into()),
-                        id: Some(file_name_str.clone()),
-                        icon: None,
-                    }),
-                    file_path_str.clone(),
-                    "Application".to_string(),
-                    cleaned_file_name,
-                    file_path_str.clone(),
-                );
-
-                // Attach icon if available
-                if let Some(icon_path) = self.icons.get(file_path_str.as_str()) {
-                    // doc.icon = Some(format!("file://{}", icon_path.to_string_lossy()));
-                    // dbg!(&doc.icon);
-                    if let Ok(icon_data) = read_icon_and_encode(icon_path) {
-                        doc.icon = Some(format!("data:image/png;base64,{}", icon_data));
-                    }
-                }
-
-                hits.push((doc, self.base_score + result.score as f64));
-            }
-        }
-
-        Ok(QueryResponse {
-            source: self.get_type(),
-            hits,
-            total_hits,
-        })
-    }
-}
-
-// Function to read the icon file and convert it to base64
-fn read_icon_and_encode(icon_path: &Path) -> Result<String, std::io::Error> {
-    // Read the icon file as binary data
-    let icon_data = fs::read(icon_path)?;
-
-    // Encode the data to base64
-    Ok(encode(&icon_data))
-}

src-tauri/src/local/application/mod.rs

@@ -0,0 +1,38 @@
+use serde::Serialize;
+
+#[cfg(feature = "use_pizza_engine")]
+mod with_feature;
+
+#[cfg(not(feature = "use_pizza_engine"))]
+mod without_feature;
+
+#[cfg(feature = "use_pizza_engine")]
+pub use with_feature::*;
+
+#[cfg(not(feature = "use_pizza_engine"))]
+pub use without_feature::*;
+
+
+#[derive(Debug, Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct AppEntry {
+    path: String,
+    name: String,
+    icon_path: String,
+    alias: String,
+    hotkey: String,
+    is_disabled: bool,
+}
+
+
+#[derive(serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AppMetadata {
+    name: String,
+    r#where: String,
+    size: u64,
+    icon: String,
+    created: u128,
+    modified: u128,
+    last_opened: u128,
+}

src-tauri/src/local/application/without_feature.rs

@@ -0,0 +1,121 @@
+use crate::common::error::SearchError;
+use crate::common::search::{QueryResponse, QuerySource, SearchQuery};
+use crate::common::traits::SearchSource;
+use crate::local::LOCAL_QUERY_SOURCE_TYPE;
+use async_trait::async_trait;
+use tauri::{AppHandle, Runtime};
+use super::AppEntry;
+use super::AppMetadata;
+
+pub(crate) const QUERYSOURCE_ID_DATASOURCE_ID_DATASOURCE_NAME: &str = "Applications";
+
+pub struct ApplicationSearchSource;
+
+impl ApplicationSearchSource {
+    pub async fn init<R: Runtime>(_app_handle: AppHandle<R>) -> Result<(), String> {
+        Ok(())
+    }
+}
+
+#[async_trait]
+impl SearchSource for ApplicationSearchSource {
+    fn get_type(&self) -> QuerySource {
+        QuerySource {
+            r#type: LOCAL_QUERY_SOURCE_TYPE.into(),
+            name: hostname::get()
+                .unwrap_or("My Computer".into())
+                .to_string_lossy()
+                .into(),
+            id: QUERYSOURCE_ID_DATASOURCE_ID_DATASOURCE_NAME.into(),
+        }
+    }
+
+    async fn search(&self, _query: SearchQuery) -> Result<QueryResponse, SearchError> {
+        Ok(QueryResponse {
+            source: self.get_type(),
+            hits: Vec::new(),
+            total_hits: 0,
+        })
+    }
+}
+
+#[tauri::command]
+pub async fn set_app_alias(_app_path: String, _alias: String) -> Result<(), String> {
+    unreachable!("app list should be empty, there is no way this can be invoked")
+}
+
+#[tauri::command]
+pub async fn register_app_hotkey<R: Runtime>(
+    _tauri_app_handle: AppHandle<R>,
+    _app_path: String,
+    _hotkey: String,
+) -> Result<(), String> {
+    unreachable!("app list should be empty, there is no way this can be invoked")
+}
+
+#[tauri::command]
+pub async fn unregister_app_hotkey<R: Runtime>(
+    _tauri_app_handle: AppHandle<R>,
+    _app_path: String,
+) -> Result<(), String> {
+    unreachable!("app list should be empty, there is no way this can be invoked")
+}
+
+#[tauri::command]
+pub async fn disable_app_search<R: Runtime>(
+    _tauri_app_handle: AppHandle<R>,
+    _app_path: String,
+) -> Result<(), String> {
+    // no-op
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn enable_app_search<R: Runtime>(
+    _tauri_app_handle: AppHandle<R>,
+    _app_path: String,
+) -> Result<(), String> {
+    // no-op
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn add_app_search_path<R: Runtime>(
+    _tauri_app_handle: AppHandle<R>,
+    _search_path: String,
+) -> Result<(), String> {
+    // no-op
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn remove_app_search_path<R: Runtime>(
+    _tauri_app_handle: AppHandle<R>,
+    _search_path: String,
+) -> Result<(), String> {
+    // no-op
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn get_app_search_path<R: Runtime>(_tauri_app_handle: AppHandle<R>) -> Vec<String> {
+    // Return an empty list
+    Vec::new()
+}
+
+
+#[tauri::command]
+pub async fn get_app_list<R: Runtime>(
+    _tauri_app_handle: AppHandle<R>,
+) -> Result<Vec<AppEntry>, String> {
+    // Return an empty list
+    Ok(Vec::new())
+}
+
+#[tauri::command]
+pub async fn get_app_metadata<R: Runtime>(
+    _tauri_app_handle: AppHandle<R>,
+    _app_path: String,
+) -> Result<AppMetadata, String> {
+    unreachable!("app list should be empty, there is no way this can be invoked")
+}

src-tauri/src/local/calculator.rs

@@ -0,0 +1,163 @@
+use super::LOCAL_QUERY_SOURCE_TYPE;
+use crate::common::{
+    document::{DataSourceReference, Document},
+    error::SearchError,
+    search::{QueryResponse, QuerySource, SearchQuery},
+    traits::SearchSource,
+};
+use async_trait::async_trait;
+use chinese_number::{ChineseCase, ChineseCountMethod, ChineseVariant, NumberToChinese};
+use num2words::Num2Words;
+use serde_json::Value;
+use std::collections::HashMap;
+
+pub(crate) const DATA_SOURCE_ID: &str = "Calculator";
+
+pub struct CalculatorSource {
+    base_score: f64,
+}
+
+impl CalculatorSource {
+    pub fn new(base_score: f64) -> Self {
+        CalculatorSource { base_score }
+    }
+}
+
+fn parse_query(query: String) -> Value {
+    let mut query_json = serde_json::Map::new();
+
+    let operators = ["+", "-", "*", "/", "%"];
+
+    let found_operators: Vec<_> = query
+        .chars()
+        .filter(|c| operators.contains(&c.to_string().as_str()))
+        .collect();
+
+    if found_operators.len() == 1 {
+        let operation = match found_operators[0] {
+            '+' => "sum",
+            '-' => "subtract",
+            '*' => "multiply",
+            '/' => "divide",
+            '%' => "remainder",
+            _ => "expression",
+        };
+
+        query_json.insert("type".to_string(), Value::String(operation.to_string()));
+    } else {
+        query_json.insert("type".to_string(), Value::String("expression".to_string()));
+    }
+
+    query_json.insert("value".to_string(), Value::String(query));
+
+    Value::Object(query_json)
+}
+
+fn parse_result(num: f64) -> Value {
+    let mut result_json = serde_json::Map::new();
+
+    let to_zh = num
+        .to_chinese(
+            ChineseVariant::Simple,
+            ChineseCase::Upper,
+            ChineseCountMethod::TenThousand,
+        )
+        .unwrap_or(num.to_string());
+
+    let to_en = Num2Words::new(num)
+        .to_words()
+        .map(|s| {
+            let mut chars = s.chars();
+            let mut result = String::new();
+            let mut capitalize = true;
+
+            while let Some(c) = chars.next() {
+                if c == ' ' || c == '-' {
+                    result.push(c);
+                    capitalize = true;
+                } else if capitalize {
+                    result.extend(c.to_uppercase());
+                    capitalize = false;
+                } else {
+                    result.push(c);
+                }
+            }
+
+            result
+        })
+        .unwrap_or(num.to_string());
+
+    result_json.insert("value".to_string(), Value::String(num.to_string()));
+    result_json.insert("toZh".to_string(), Value::String(to_zh));
+    result_json.insert("toEn".to_string(), Value::String(to_en));
+
+    Value::Object(result_json)
+}
+
+#[async_trait]
+impl SearchSource for CalculatorSource {
+    fn get_type(&self) -> QuerySource {
+        QuerySource {
+            r#type: LOCAL_QUERY_SOURCE_TYPE.into(),
+            name: hostname::get()
+                .unwrap_or(DATA_SOURCE_ID.into())
+                .to_string_lossy()
+                .into(),
+            id: DATA_SOURCE_ID.into(),
+        }
+    }
+
+    async fn search(&self, query: SearchQuery) -> Result<QueryResponse, SearchError> {
+        let query_string = query
+            .query_strings
+            .get("query")
+            .unwrap_or(&"".to_string())
+            .to_string();
+
+        if query_string.is_empty() || query_string.len() == 1 {
+            return Ok(QueryResponse {
+                source: self.get_type(),
+                hits: Vec::new(),
+                total_hits: 0,
+            });
+        }
+
+        match meval::eval_str(&query_string) {
+            Ok(num) => {
+                let mut payload: HashMap<String, Value> = HashMap::new();
+
+                let payload_query = parse_query(query_string);
+                let payload_result = parse_result(num);
+
+                payload.insert("query".to_string(), payload_query);
+                payload.insert("result".to_string(), payload_result);
+
+                let doc = Document {
+                    id: DATA_SOURCE_ID.to_string(),
+                    category: Some(DATA_SOURCE_ID.to_string()),
+                    payload: Some(payload),
+                    source: Some(DataSourceReference {
+                        r#type: Some(LOCAL_QUERY_SOURCE_TYPE.into()),
+                        name: Some(DATA_SOURCE_ID.into()),
+                        id: Some(DATA_SOURCE_ID.into()),
+                        icon: None,
+                    }),
+                    ..Default::default()
+                };
+
+                return Ok(QueryResponse {
+                    source: self.get_type(),
+                    hits: vec![(doc, self.base_score)],
+                    total_hits: 1,
+                });
+            }
+            Err(_) => {
+                return Ok(QueryResponse {
+                    source: self.get_type(),
+                    hits: Vec::new(),
+                    total_hits: 0,
+                });
+            }
+        };
+    }
+}

src-tauri/src/local/mod.rs

@@ -1,4 +1,164 @@
 pub mod application;
+pub mod calculator;
 pub mod file_system;
 
-pub const LOCAL_QUERY_SOURCE_TYPE: &str = "local";
+use std::any::Any;
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+use std::sync::OnceLock;
+
+use crate::common::register::SearchSourceRegistry;
+use serde_json::Value as Json;
+use tauri::{AppHandle, Manager, Runtime};
+use tauri_plugin_store::StoreExt;
+
+pub const LOCAL_QUERY_SOURCE_TYPE: &str = "local";
+pub const TAURI_STORE_LOCAL_QUERY_SOURCE_ENABLED_STATE: &str = "local_query_source_enabled_state";
+
+trait SearchSourceState {
+    #[cfg_attr(not(feature = "use_pizza_engine"), allow(unused))]
+    fn as_mut_any(&mut self) -> &mut dyn Any;
+}
+
+#[async_trait::async_trait(?Send)]
+trait Task: Send + Sync {
+    fn search_source_id(&self) -> &'static str;
+
+    async fn exec(&mut self, state: &mut Option<Box<dyn SearchSourceState>>);
+}
+
+static RUNTIME_TX: OnceLock<tokio::sync::mpsc::UnboundedSender<Box<dyn Task>>> = OnceLock::new();
+
+pub(crate) fn start_pizza_engine_runtime() {
+    std::thread::spawn(|| {
+        let rt = tokio::runtime::Runtime::new().unwrap();
+
+        let main = async {
+            let mut states: HashMap<String, Option<Box<dyn SearchSourceState>>> = HashMap::new();
+
+            let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
+            RUNTIME_TX.set(tx).unwrap();
+
+            while let Some(mut task) = rx.recv().await {
+                let opt_search_source_state = match states.entry(task.search_source_id().into()) {
+                    Entry::Occupied(o) => o.into_mut(),
+                    Entry::Vacant(v) => v.insert(None),
+                };
+                task.exec(opt_search_source_state).await;
+            }
+        };
+
+        rt.block_on(main);
+    });
+}
+
+pub(crate) async fn init_local_search_source<R: Runtime>(
+    app_handle: &AppHandle<R>,
+) -> Result<(), String> {
+    let enabled_status_store = app_handle
+        .store(TAURI_STORE_LOCAL_QUERY_SOURCE_ENABLED_STATE)
+        .map_err(|e| e.to_string())?;
+    if enabled_status_store.is_empty() {
+        enabled_status_store.set(
+            application::QUERYSOURCE_ID_DATASOURCE_ID_DATASOURCE_NAME,
+            Json::Bool(true),
+        );
+        enabled_status_store.set(calculator::DATA_SOURCE_ID, Json::Bool(true));
+    }
+    let registry = app_handle.state::<SearchSourceRegistry>();
+
+    application::ApplicationSearchSource::init(app_handle.clone()).await?;
+
+    for (id, enabled) in enabled_status_store.entries() {
+        let enabled = match enabled {
+            Json::Bool(b) => b,
+            _ => unreachable!("enabled state should be stored as a boolean"),
+        };
+
+        if enabled {
+            if id == application::QUERYSOURCE_ID_DATASOURCE_ID_DATASOURCE_NAME {
+                registry
+                    .register_source(application::ApplicationSearchSource)
+                    .await;
+            }
+
+            if id == calculator::DATA_SOURCE_ID {
+                let calculator_search = calculator::CalculatorSource::new(2000f64);
+                registry.register_source(calculator_search).await;
+            }
+        }
+    }
+
+    Ok(())
+}
+
+#[tauri::command]
+pub async fn get_disabled_local_query_sources<R: Runtime>(app_handle: AppHandle<R>) -> Vec<String> {
+    let enabled_status_store = app_handle
+        .store(TAURI_STORE_LOCAL_QUERY_SOURCE_ENABLED_STATE)
+        .unwrap_or_else(|e| {
+            panic!(
+                "tauri store [{}] should exist and be loaded, but that's not true due to error [{}]",
+                TAURI_STORE_LOCAL_QUERY_SOURCE_ENABLED_STATE, e
+            )
+        });
+    let mut disabled_local_query_sources = Vec::new();
+
+    for (id, enabled) in enabled_status_store.entries() {
+        let enabled = match enabled {
+            Json::Bool(b) => b,
+            _ => unreachable!("enabled state should be stored as a boolean"),
+        };
+
+        if !enabled {
+            disabled_local_query_sources.push(id);
+        }
+    }
+
+    disabled_local_query_sources
+}
+
+#[tauri::command]
+pub async fn enable_local_query_source<R: Runtime>(
+    app_handle: AppHandle<R>,
+    query_source_id: String,
+) {
+    let registry = app_handle.state::<SearchSourceRegistry>();
+    if query_source_id == application::QUERYSOURCE_ID_DATASOURCE_ID_DATASOURCE_NAME {
+        let application_search = application::ApplicationSearchSource;
+        registry.register_source(application_search).await;
+    }
+    if query_source_id == calculator::DATA_SOURCE_ID {
+        let calculator_search = calculator::CalculatorSource::new(2000f64);
+        registry.register_source(calculator_search).await;
+    }
+
+    let enabled_status_store = app_handle
+        .store(TAURI_STORE_LOCAL_QUERY_SOURCE_ENABLED_STATE)
+        .unwrap_or_else(|e| {
+            panic!(
+              "tauri store [{}] should exist and be loaded, but that's not true due to error [{}]",
+              TAURI_STORE_LOCAL_QUERY_SOURCE_ENABLED_STATE, e
+          )
+        });
+    enabled_status_store.set(query_source_id, Json::Bool(true));
+}
+
+#[tauri::command]
+pub async fn disable_local_query_source<R: Runtime>(
+    app_handle: AppHandle<R>,
+    query_source_id: String,
+) {
+    let registry = app_handle.state::<SearchSourceRegistry>();
+    registry.remove_source(&query_source_id).await;
+
+    let enabled_status_store = app_handle
+        .store(TAURI_STORE_LOCAL_QUERY_SOURCE_ENABLED_STATE)
+        .unwrap_or_else(|e| {
+            panic!(
+          "tauri store [{}] should exist and be loaded, but that's not true due to error [{}]",
+          TAURI_STORE_LOCAL_QUERY_SOURCE_ENABLED_STATE, e
+      )
+        });
+    enabled_status_store.set(query_source_id, Json::Bool(false));
+}

src-tauri/src/search/mod.rs

@@ -1,8 +1,8 @@
+use crate::common::error::SearchError;
 use crate::common::register::SearchSourceRegistry;
 use crate::common::search::{
     FailedRequest, MultiSourceQueryResponse, QueryHits, QuerySource, SearchQuery,
 };
-use crate::common::traits::SearchError;
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use std::collections::HashMap;
@@ -16,7 +16,10 @@ pub async fn query_coco_fusion<R: Runtime>(
     from: u64,
     size: u64,
     query_strings: HashMap<String, String>,
+    query_timeout: u64,
 ) -> Result<MultiSourceQueryResponse, SearchError> {
+    let query_source_to_search = query_strings.get("querysource");
+
     let search_sources = app_handle.state::<SearchSourceRegistry>();
 
     let sources_future = search_sources.get_sources();
@@ -26,11 +29,19 @@ pub async fn query_coco_fusion<R: Runtime>(
     let sources_list = sources_future.await;
 
     // Time limit for each query
-    let timeout_duration = Duration::from_millis(500); //TODO, settings
+    let timeout_duration = Duration::from_millis(query_timeout);
 
     // Push all queries into futures
     for query_source in sources_list {
         let query_source_type = query_source.get_type().clone();
+
+        if let Some(query_source_to_search) = query_source_to_search {
+            // We should not search this data source
+            if &query_source_type.id != query_source_to_search {
+                continue;
+            }
+        }
+
         sources.insert(query_source_type.id.clone(), query_source_type);
 
         let query = SearchQuery::new(from, size, query_strings.clone());
@@ -71,6 +82,18 @@ pub async fn query_coco_fusion<R: Runtime>(
                         .push((query_hit, score));
                 }
             }
+            Ok(Ok(Err(err))) => {
+                failed_requests.push(FailedRequest {
+                    source: QuerySource {
+                        r#type: "N/A".into(),
+                        name: "N/A".into(),
+                        id: "N/A".into(),
+                    },
+                    status: 0,
+                    error: Some(err.to_string()),
+                    reason: None,
+                });
+            }
             Ok(Err(err)) => {
                 failed_requests.push(FailedRequest {
                     source: QuerySource {
@@ -84,7 +107,7 @@ pub async fn query_coco_fusion<R: Runtime>(
                 });
             }
             // Timeout reached, skip this request
-            Ok(_) => {
+            _ => {
                 failed_requests.push(FailedRequest {
                     source: QuerySource {
                         r#type: "N/A".into(),
@@ -92,19 +115,7 @@ pub async fn query_coco_fusion<R: Runtime>(
                         id: "N/A".into(),
                     },
                     status: 0,
-                    error: Some("Query source timed out".to_string()),
-                    reason: None,
-                });
-            }
-            Err(_) => {
-                failed_requests.push(FailedRequest {
-                    source: QuerySource {
-                        r#type: "N/A".into(),
-                        name: "N/A".into(),
-                        id: "N/A".into(),
-                    },
-                    status: 0,
-                    error: Some("Task panicked".to_string()),
+                    error: Some(format!("{:?}", &result)),
                     reason: None,
                 });
             }

src-tauri/src/server/attachment.rs

@@ -1,4 +1,5 @@
 use super::servers::{get_server_by_id, get_server_token};
+use crate::common::http::get_response_body_text;
 use crate::server::http_client::HttpClient;
 use reqwest::multipart::{Form, Part};
 use serde::{Deserialize, Serialize};
@@ -29,24 +30,24 @@ pub struct AttachmentSource {
 #[derive(Debug, Serialize, Deserialize)]
 pub struct AttachmentHit {
     pub _index: String,
-    pub _type: String,
+    pub _type: Option<String>,
     pub _id: String,
-    pub _score: f64,
+    pub _score: Option<f64>,
     pub _source: AttachmentSource,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct AttachmentHits {
     pub total: Value,
-    pub max_score: f64,
-    pub hits: Vec<AttachmentHit>,
+    pub max_score: Option<f64>,
+    pub hits: Option<Vec<AttachmentHit>>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct GetAttachmentResponse {
     pub took: u32,
     pub timed_out: bool,
-    pub _shards: Value,
+    pub _shards: Option<Value>,
     pub hits: AttachmentHits,
 }
 
@@ -99,16 +100,10 @@ pub async fn upload_attachment(
         .await
         .map_err(|err| err.to_string())?;
 
-    if response.status().is_success() {
-        let result = response
-            .json::<UploadAttachmentResponse>()
-            .await
-            .map_err(|err| err.to_string())?;
+    let body = get_response_body_text(response).await?;
 
-        Ok(result)
-    } else {
-        Err(format!("Upload failed with status: {}", response.status()))
-    }
+    serde_json::from_str::<UploadAttachmentResponse>(&body)
+        .map_err(|e| format!("Failed to parse upload response: {}", e))
 }
 
 #[command]
@@ -119,33 +114,30 @@ pub async fn get_attachment(
     let mut query_params = HashMap::new();
     query_params.insert("session".to_string(), serde_json::Value::String(session_id));
 
-    let response = HttpClient::get(&server_id, "/attachment/_search", Some(query_params)).await?;
+    let response = HttpClient::get(&server_id, "/attachment/_search", Some(query_params))
+        .await
+        .map_err(|e| format!("Request error: {}", e))?;
 
-    if response.status().is_success() {
-        response
-            .json::<GetAttachmentResponse>()
-            .await
-            .map_err(|e| e.to_string())
-    } else {
-        Err(format!("Request failed with status: {}", response.status()))
-    }
+    let body = get_response_body_text(response).await?;
+    
+    serde_json::from_str::<GetAttachmentResponse>(&body)
+        .map_err(|e| format!("Failed to parse attachment response: {}", e))
 }
 
 #[command]
 pub async fn delete_attachment(server_id: String, id: String) -> Result<bool, String> {
-    let response =
-        HttpClient::delete(&server_id, &format!("/attachment/{}", id), None, None).await?;
+    let response = HttpClient::delete(&server_id, &format!("/attachment/{}", id), None, None)
+        .await
+        .map_err(|e| format!("Request error: {}", e))?;
 
-    if response.status().is_success() {
-        response
-            .json::<DeleteAttachmentResponse>()
-            .await
-            .map_err(|e| e.to_string())?
-            .result
-            .eq("deleted")
-            .then_some(true)
-            .ok_or("Delete operation was not successful".to_string())
-    } else {
-        Err(format!("Delete failed with status: {}", response.status()))
-    }
+    let body = get_response_body_text(response).await?;
+
+    let parsed: DeleteAttachmentResponse = serde_json::from_str(&body)
+        .map_err(|e| format!("Failed to parse delete response: {}", e))?;
+
+    parsed
+        .result
+        .eq("deleted")
+        .then_some(true)
+        .ok_or_else(|| "Delete operation was not successful".to_string())
 }

src-tauri/src/server/auth.rs

@@ -1,11 +1,12 @@
-use crate::common::auth::RequestAccessTokenResponse;
 use crate::common::server::ServerAccessToken;
-use crate::server::http_client::HttpClient;
 use crate::server::profile::get_user_profiles;
-use crate::server::servers::{get_server_by_id, persist_servers, persist_servers_token, save_access_token, save_server, try_register_server_to_search_source};
-use reqwest::StatusCode;
-use std::collections::HashMap;
+use crate::server::servers::{
+    get_server_by_id, persist_servers, persist_servers_token, save_access_token, save_server,
+    try_register_server_to_search_source,
+};
 use tauri::{AppHandle, Runtime};
+
+#[allow(dead_code)]
 fn request_access_token_url(request_id: &str) -> String {
     // Remove the endpoint part and keep just the path for the request
     format!("/auth/request_access_token?request_id={}", request_id)
@@ -21,71 +22,30 @@ pub async fn handle_sso_callback<R: Runtime>(
     // Retrieve the server details using the server ID
     let server = get_server_by_id(&server_id);
 
+    let expire_in = 3600; // TODO, need to update to actual expire_in value
     if let Some(mut server) = server {
-        // Prepare the URL for requesting the access token (endpoint is base URL, path is relative)
-        // save_access_token(server_id.clone(), ServerAccessToken::new(server_id.clone(), code.clone(), 60 * 15));
-        let path = request_access_token_url(&request_id);
+        // Save the access token for the server
+        let access_token = ServerAccessToken::new(server_id.clone(), code.clone(), expire_in);
+        // dbg!(&server_id, &request_id, &code, &token);
+        save_access_token(server_id.clone(), access_token);
+        persist_servers_token(&app_handle)?;
 
-        // Send the request for the access token using the util::http::HttpClient::get method
-        let mut header = HashMap::new();
-        header.insert("Authorization".to_string(), format!("Bearer {}", code).to_string());
-        let response = HttpClient::advanced_post(&server_id, &path, Some(header), None, None)
-            .await
-            .map_err(|e| format!("Failed to send request to the server: {}", e))?;
+        // Register the server to the search source
+        try_register_server_to_search_source(app_handle.clone(), &server).await;
 
-        if response.status() == StatusCode::OK {
-            // Check if the response has a valid content length
-            if let Some(content_length) = response.content_length() {
-                if content_length > 0 {
-                    // Deserialize the response body to get the access token
-                    let token_result: Result<RequestAccessTokenResponse, _> = response.json().await;
+        // Update the server's profile using the util::http::HttpClient::get method
+        let profile = get_user_profiles(app_handle.clone(), server_id.clone()).await;
+        dbg!(&profile);
 
-                    match token_result {
-                        Ok(token) => {
-                            // Save the access token for the server
-                            let access_token = ServerAccessToken::new(
-                                server_id.clone(),
-                                token.access_token.clone(),
-                                token.expire_in,
-                            );
-                            // dbg!(&server_id, &request_id, &code, &token);
-                            save_access_token(server_id.clone(), access_token);
-                            persist_servers_token(&app_handle)?;
-
-                            // Register the server to the search source
-                            try_register_server_to_search_source(app_handle.clone(), &server).await;
-
-                            // Update the server's profile using the util::http::HttpClient::get method
-                            let profile = get_user_profiles(app_handle.clone(), server_id.clone()).await;
-                            dbg!(&profile);
-
-                            match profile {
-                                Ok(p) => {
-                                    server.profile = Some(p);
-                                    server.available = true;
-                                    save_server(&server);
-                                    persist_servers(&app_handle).await?;
-                                    Ok(())
-                                }
-                                Err(e) => Err(format!("Failed to get user profile: {}", e)),
-                            }
-                        }
-                        Err(e) => Err(format!("Failed to deserialize the token response: {}", e)),
-                    }
-                } else {
-                    Err("Received empty response body.".to_string())
-                }
-            } else {
-                Err("Could not determine the content length.".to_string())
+        match profile {
+            Ok(p) => {
+                server.profile = Some(p);
+                server.available = true;
+                save_server(&server);
+                persist_servers(&app_handle).await?;
+                Ok(())
             }
-        } else {
-            Err(format!(
-                "Request failed with status: {}, URL: {}, Code: {}, Response: {:?}",
-                response.status(),
-                path,
-                code,
-                response
-            ))
+            Err(e) => Err(format!("Failed to get user profile: {}", e)),
         }
     } else {
         Err(format!(
@@ -93,4 +53,4 @@ pub async fn handle_sso_callback<R: Runtime>(
             server_id, request_id, code
         ))
     }
-}
+}

src-tauri/src/server/connector.rs

@@ -34,6 +34,10 @@ pub async fn refresh_all_connectors<R: Runtime>(app_handle: &AppHandle<R>) -> Re
     // Collect all the tasks for fetching and refreshing connectors
     let mut server_map = HashMap::new();
     for server in servers {
+        if !server.enabled {
+            continue;
+        }
+
         // dbg!("start fetch connectors for server: {}", &server.id);
         let connectors = match get_connectors_by_server(app_handle.clone(), server.id.clone()).await
         {

src-tauri/src/server/datasource.rs

@@ -8,6 +8,13 @@ use std::collections::HashMap;
 use std::sync::{Arc, RwLock};
 use tauri::{AppHandle, Runtime};
 
+#[derive(serde::Deserialize, Debug)]
+pub struct GetDatasourcesByServerOptions {
+    pub from: Option<u32>,
+    pub size: Option<u32>,
+    pub query: Option<String>,
+}
+
 lazy_static! {
     static ref DATASOURCE_CACHE: Arc<RwLock<HashMap<String, HashMap<String, DataSource>>>> =
         Arc::new(RwLock::new(HashMap::new()));
@@ -40,8 +47,12 @@ pub async fn refresh_all_datasources<R: Runtime>(_app_handle: &AppHandle<R>) ->
     for server in servers {
         // dbg!("fetch datasources for server: {}", &server.id);
 
+        if !server.enabled {
+            continue;
+        }
+
         // Attempt to get datasources by server, and continue even if it fails
-        let connectors = match get_datasources_by_server(server.id.as_str()).await {
+        let connectors = match datasource_search(server.id.as_str(), None).await {
             Ok(connectors) => {
                 // Process connectors only after fetching them
                 let connectors_map: HashMap<String, DataSource> = connectors
@@ -83,13 +94,48 @@ pub async fn refresh_all_datasources<R: Runtime>(_app_handle: &AppHandle<R>) ->
 }
 
 #[tauri::command]
-pub async fn get_datasources_by_server(id: &str) -> Result<Vec<DataSource>, String> {
+pub async fn datasource_search(
+    id: &str,
+    options: Option<GetDatasourcesByServerOptions>,
+) -> Result<Vec<DataSource>, String> {
+    let from = options.as_ref().and_then(|opt| opt.from).unwrap_or(0);
+    let size = options.as_ref().and_then(|opt| opt.size).unwrap_or(10000);
+    let query = options
+        .and_then(|opt| opt.query)
+        .unwrap_or(String::default());
+
+    let mut body = serde_json::json!({
+        "from": from,
+        "size": size,
+    });
+
+    if !query.is_empty() {
+        body["query"] = serde_json::json!({
+              "bool": {
+                  "must": [{
+                      "query_string": {
+                          "fields": ["combined_fulltext"],
+                          "query": query,
+                          "fuzziness": "AUTO",
+                          "fuzzy_prefix_length": 2,
+                          "fuzzy_max_expansions": 10,
+                          "fuzzy_transpositions": true,
+                          "allow_leading_wildcard": false
+                      }
+                  }]
+              }
+        });
+    }
+
     // Perform the async HTTP request outside the cache lock
-    let resp = HttpClient::get(id, "/datasource/_search", None)
+    let resp = HttpClient::post(
+        id,
+        "/datasource/_search",
+        None,
+        Some(reqwest::Body::from(body.to_string())),
+    )
         .await
-        .map_err(|e| {
-            format!("Error fetching datasource: {}", e)
-        })?;
+        .map_err(|e| format!("Error fetching datasource: {}", e))?;
 
     // Parse the search results from the response
     let datasources: Vec<DataSource> = parse_search_results(resp).await.map_err(|e| {
@@ -102,3 +148,59 @@ pub async fn get_datasources_by_server(id: &str) -> Result<Vec<DataSource>, Stri
 
     Ok(datasources)
 }
+
+#[tauri::command]
+pub async fn mcp_server_search(
+    id: &str,
+    options: Option<GetDatasourcesByServerOptions>,
+) -> Result<Vec<DataSource>, String> {
+    let from = options.as_ref().and_then(|opt| opt.from).unwrap_or(0);
+    let size = options.as_ref().and_then(|opt| opt.size).unwrap_or(10000);
+    let query = options
+        .and_then(|opt| opt.query)
+        .unwrap_or(String::default());
+
+    let mut body = serde_json::json!({
+        "from": from,
+        "size": size,
+    });
+
+    if !query.is_empty() {
+        body["query"] = serde_json::json!({
+              "bool": {
+                  "must": [{
+                      "query_string": {
+                          "fields": ["combined_fulltext"],
+                          "query": query,
+                          "fuzziness": "AUTO",
+                          "fuzzy_prefix_length": 2,
+                          "fuzzy_max_expansions": 10,
+                          "fuzzy_transpositions": true,
+                          "allow_leading_wildcard": false
+                      }
+                  }]
+              }
+        });
+    }
+
+    // Perform the async HTTP request outside the cache lock
+    let resp = HttpClient::post(
+        id,
+        "/mcp_server/_search",
+        None,
+        Some(reqwest::Body::from(body.to_string())),
+    )
+        .await
+        .map_err(|e| format!("Error fetching datasource: {}", e))?;
+
+    // Parse the search results from the response
+    let mcp_server: Vec<DataSource> = parse_search_results(resp).await.map_err(|e| {
+        dbg!("Error parsing search results: {}", &e);
+        e.to_string()
+    })?;
+
+    // Save the updated mcp_server to cache
+    // save_datasource_to_cache(&id, mcp_server.clone());
+
+    Ok(mcp_server)
+}

src-tauri/src/server/http_client.rs

@@ -1,21 +1,30 @@
 use crate::server::servers::{get_server_by_id, get_server_token};
-use http::HeaderName;
+use http::{HeaderName, HeaderValue};
 use once_cell::sync::Lazy;
 use reqwest::{Client, Method, RequestBuilder};
-use serde_json::Value;
 use std::collections::HashMap;
 use std::time::Duration;
+use tauri_plugin_store::JsonValue;
 use tokio::sync::Mutex;
 
-pub static HTTP_CLIENT: Lazy<Mutex<Client>> = Lazy::new(|| {
-    let client = Client::builder()
+pub(crate) fn new_reqwest_http_client(accept_invalid_certs: bool) -> Client {
+    Client::builder()
         .read_timeout(Duration::from_secs(3)) // Set a timeout of 3 second
         .connect_timeout(Duration::from_secs(3)) // Set a timeout of 3 second
         .timeout(Duration::from_secs(10)) // Set a timeout of 10 seconds
-        .danger_accept_invalid_certs(true) // example for self-signed certificates
+        .danger_accept_invalid_certs(accept_invalid_certs) // allow self-signed certificates
         .build()
-        .expect("Failed to build client");
-    Mutex::new(client)
+        .expect("Failed to build client")
+}
+
+pub static HTTP_CLIENT: Lazy<Mutex<Client>> = Lazy::new(|| {
+    let allow_self_signature = crate::settings::_get_allow_self_signature(
+        crate::GLOBAL_TAURI_APP_HANDLE
+            .get()
+            .expect("global tauri app store not set")
+            .clone(),
+    );
+    Mutex::new(new_reqwest_http_client(allow_self_signature))
 });
 
 pub struct HttpClient;
@@ -31,17 +40,33 @@ impl HttpClient {
     pub async fn send_raw_request(
         method: Method,
         url: &str,
-        query_params: Option<HashMap<String, Value>>,
+        query_params: Option<HashMap<String, JsonValue>>,
         headers: Option<HashMap<String, String>>,
         body: Option<reqwest::Body>,
     ) -> Result<reqwest::Response, String> {
+        log::debug!(
+            "Sending Request: {}, query_params: {:?}, header: {:?}, body: {:?}",
+            &url,
+            &query_params,
+            &headers,
+            &body
+        );
+
         let request_builder =
             Self::get_request_builder(method, url, headers, query_params, body).await;
 
-        let response = request_builder
-            .send()
-            .await
-            .map_err(|e| format!("Failed to send request: {}", e))?;
+        let response = request_builder.send().await.map_err(|e| {
+            dbg!("Failed to send request: {}", &e);
+            format!("Failed to send request: {}", e)
+        })?;
+
+        log::debug!(
+            "Request: {}, Response status: {:?}, header: {:?}",
+            &url,
+            &response.status(),
+            &response.headers()
+        );
+
         Ok(response)
     }
 
@@ -49,7 +74,7 @@ impl HttpClient {
         method: Method,
         url: &str,
         headers: Option<HashMap<String, String>>,
-        query_params: Option<HashMap<String, Value>>, // Add query parameters
+        query_params: Option<HashMap<String, JsonValue>>, // Add query parameters
         body: Option<reqwest::Body>,
     ) -> RequestBuilder {
         let client = HTTP_CLIENT.lock().await; // Acquire the lock on HTTP_CLIENT
@@ -60,17 +85,48 @@ impl HttpClient {
         if let Some(h) = headers {
             let mut req_headers = reqwest::header::HeaderMap::new();
             for (key, value) in h.into_iter() {
-                let _ = req_headers.insert(
-                    HeaderName::from_bytes(key.as_bytes()).unwrap(),
-                    reqwest::header::HeaderValue::from_str(&value).unwrap(),
-                );
+                match (
+                    HeaderName::from_bytes(key.as_bytes()),
+                    HeaderValue::from_str(value.trim()),
+                ) {
+                    (Ok(name), Ok(val)) => {
+                        req_headers.insert(name, val);
+                    }
+                    (Err(e), _) => {
+                        eprintln!("Invalid header name: {:?}, error: {}", key, e);
+                    }
+                    (_, Err(e)) => {
+                        eprintln!(
+                            "Invalid header value for {}: {:?}, error: {}",
+                            key, value, e
+                        );
+                    }
+                }
             }
             request_builder = request_builder.headers(req_headers);
         }
 
         if let Some(query) = query_params {
+            // Convert only supported value types into strings
+            let query: HashMap<String, String> = query
+                .into_iter()
+                .filter_map(|(k, v)| {
+                    match v {
+                        JsonValue::String(s) => Some((k, s)),
+                        JsonValue::Number(n) => Some((k, n.to_string())),
+                        JsonValue::Bool(b) => Some((k, b.to_string())),
+                        _ => {
+                            dbg!(
+                                "Unsupported query parameter type. Only strings, numbers, and booleans are supported.",k,v,
+                            );
+                            None
+                        } // skip arrays, objects, nulls
+                    }
+                })
+                .collect();
             request_builder = request_builder.query(&query);
         }
+
         // Add body if present
         if let Some(b) = body {
             request_builder = request_builder.body(b);
@@ -84,7 +140,7 @@ impl HttpClient {
         method: Method,
         path: &str,
         custom_headers: Option<HashMap<String, String>>,
-        query_params: Option<HashMap<String, Value>>,
+        query_params: Option<HashMap<String, JsonValue>>,
         body: Option<reqwest::Body>,
     ) -> Result<reqwest::Response, String> {
         // Fetch the server using the server_id
@@ -109,9 +165,12 @@ impl HttpClient {
                 headers.insert("X-API-TOKEN".to_string(), t);
             }
 
-            // dbg!(&server_id);
-            // dbg!(&url);
-            // dbg!(&headers);
+            log::debug!(
+                "Sending request to server: {}, url: {}, headers: {:?}",
+                &server_id,
+                &url,
+                &headers
+            );
 
             Self::send_raw_request(method, &url, query_params, Some(headers), body).await
         } else {
@@ -123,7 +182,7 @@ impl HttpClient {
     pub async fn get(
         server_id: &str,
         path: &str,
-        query_params: Option<HashMap<String, Value>>, // Add query parameters
+        query_params: Option<HashMap<String, JsonValue>>, // Add query parameters
     ) -> Result<reqwest::Response, String> {
         HttpClient::send_request(server_id, Method::GET, path, None, query_params, None).await
     }
@@ -132,7 +191,7 @@ impl HttpClient {
     pub async fn post(
         server_id: &str,
         path: &str,
-        query_params: Option<HashMap<String, Value>>, // Add query parameters
+        query_params: Option<HashMap<String, JsonValue>>, // Add query parameters
         body: Option<reqwest::Body>,
     ) -> Result<reqwest::Response, String> {
         HttpClient::send_request(server_id, Method::POST, path, None, query_params, body).await
@@ -142,7 +201,7 @@ impl HttpClient {
         server_id: &str,
         path: &str,
         custom_headers: Option<HashMap<String, String>>,
-        query_params: Option<HashMap<String, Value>>, // Add query parameters
+        query_params: Option<HashMap<String, JsonValue>>, // Add query parameters
         body: Option<reqwest::Body>,
     ) -> Result<reqwest::Response, String> {
         HttpClient::send_request(
@@ -162,7 +221,7 @@ impl HttpClient {
         server_id: &str,
         path: &str,
         custom_headers: Option<HashMap<String, String>>,
-        query_params: Option<HashMap<String, Value>>, // Add query parameters
+        query_params: Option<HashMap<String, JsonValue>>, // Add query parameters
         body: Option<reqwest::Body>,
     ) -> Result<reqwest::Response, String> {
         HttpClient::send_request(
@@ -182,7 +241,7 @@ impl HttpClient {
         server_id: &str,
         path: &str,
         custom_headers: Option<HashMap<String, String>>,
-        query_params: Option<HashMap<String, Value>>, // Add query parameters
+        query_params: Option<HashMap<String, JsonValue>>, // Add query parameters
     ) -> Result<reqwest::Response, String> {
         HttpClient::send_request(
             server_id,

src-tauri/src/server/mod.rs

@@ -8,5 +8,6 @@ pub mod http_client;
 pub mod profile;
 pub mod search;
 pub mod servers;
+pub mod system_settings;
 pub mod transcription;
 pub mod websocket;

src-tauri/src/server/profile.rs

@@ -1,3 +1,4 @@
+use crate::common::http::get_response_body_text;
 use crate::common::profile::UserProfile;
 use crate::server::http_client::HttpClient;
 use tauri::{AppHandle, Runtime};
@@ -12,14 +13,16 @@ pub async fn get_user_profiles<R: Runtime>(
         .await
         .map_err(|e| format!("Error fetching profile: {}", e))?;
 
-    if let Some(content_length) = response.content_length() {
-        if content_length > 0 {
-            let profile: UserProfile = response
-                .json()
-                .await
-                .map_err(|e| format!("Failed to parse response: {}", e))?;
-            return Ok(profile);
-        }
+    // Use get_response_body_text to extract the body content
+    let response_body = get_response_body_text(response)
+        .await
+        .map_err(|e| format!("Failed to read response body: {}", e))?;
+
+    // Check if the response body is not empty before deserializing
+    if !response_body.is_empty() {
+        let profile: UserProfile = serde_json::from_str(&response_body)
+            .map_err(|e| format!("Failed to parse response: {}", e))?;
+        return Ok(profile);
     }
 
     Err("Profile not found or empty response".to_string())

src-tauri/src/server/search.rs

@@ -1,16 +1,15 @@
 use crate::common::document::Document;
-use crate::common::search::{
-    parse_search_response, QueryHits, QueryResponse, QuerySource, SearchQuery,
-};
+use crate::common::error::SearchError;
+use crate::common::http::get_response_body_text;
+use crate::common::search::{QueryHits, QueryResponse, QuerySource, SearchQuery, SearchResponse};
 use crate::common::server::Server;
-use crate::common::traits::{SearchError, SearchSource};
+use crate::common::traits::SearchSource;
 use crate::server::http_client::HttpClient;
-use crate::server::servers::get_server_token;
 use async_trait::async_trait;
 // use futures::stream::StreamExt;
 use ordered_float::OrderedFloat;
-use reqwest::{Client, Method, RequestBuilder};
 use std::collections::HashMap;
+use tauri_plugin_store::JsonValue;
 // use std::hash::Hash;
 
 #[allow(dead_code)]
@@ -46,7 +45,7 @@ impl DocumentsSizedCollector {
         }
     }
 
-    fn documents(self) -> impl ExactSizeIterator<Item = Document> {
+    fn documents(self) -> impl ExactSizeIterator<Item=Document> {
         self.docs.into_iter().map(|(_, doc, _)| doc)
     }
 
@@ -74,45 +73,11 @@ const COCO_SERVERS: &str = "coco-servers";
 
 pub struct CocoSearchSource {
     server: Server,
-    client: Client,
 }
 
 impl CocoSearchSource {
-    pub fn new(server: Server, client: Client) -> Self {
-        CocoSearchSource { server, client }
-    }
-
-    async fn build_request_from_query(
-        &self,
-        query: &SearchQuery,
-    ) -> Result<RequestBuilder, String> {
-        self.build_request(query.from, query.size, &query.query_strings)
-            .await
-    }
-
-    async fn build_request(
-        &self,
-        from: u64,
-        size: u64,
-        query_strings: &HashMap<String, String>,
-    ) -> Result<RequestBuilder, String> {
-        let url = HttpClient::join_url(&self.server.endpoint, "/query/_search");
-        let mut request_builder = self.client.request(Method::GET, url);
-
-        if !self.server.public {
-            if let Some(token) = get_server_token(&self.server.id)
-                .await?
-                .map(|t| t.access_token)
-            {
-                request_builder = request_builder.header("X-API-TOKEN", token);
-            }
-        }
-
-        let result = request_builder
-            .query(&[("from", &from.to_string()), ("size", &size.to_string())])
-            .query(query_strings);
-
-        Ok(result)
+    pub fn new(server: Server) -> Self {
+        CocoSearchSource { server }
     }
 }
 
@@ -126,58 +91,47 @@ impl SearchSource for CocoSearchSource {
         }
     }
 
-    // Directly return Result<QueryResponse, SearchError> instead of Future
     async fn search(&self, query: SearchQuery) -> Result<QueryResponse, SearchError> {
-        let _server_id = self.server.id.clone();
-        let _server_name = self.server.name.clone();
-        let request_builder = self.build_request_from_query(&query).await.unwrap();
+        let url = "/query/_search";
 
-        // Send the HTTP request asynchronously
-        let response = request_builder.send().await;
-
-        match response {
-            Ok(response) => {
-                let status_code = response.status().as_u16();
-
-                if status_code >= 200 && status_code < 400 {
-                    // Parse the response only if the status code is successful
-                    match parse_search_response(response).await {
-                        Ok(response) => {
-                            let total_hits = response.hits.total.value as usize;
-                            let hits: Vec<(Document, f64)> = response
-                                .hits
-                                .hits
-                                .into_iter()
-                                .map(|hit| {
-                                    // Handling Option<f64> in hit._score by defaulting to 0.0 if None
-                                    (hit._source, hit._score.unwrap_or(0.0)) // Use 0.0 if _score is None
-                                })
-                                .collect();
-
-                            // Return the QueryResponse with hits and total hits
-                            Ok(QueryResponse {
-                                source: self.get_type(),
-                                hits,
-                                total_hits,
-                            })
-                        }
-                        Err(err) => {
-                            // Parse error when response parsing fails
-                            Err(SearchError::ParseError(err.to_string()))
-                        }
-                    }
-                } else {
-                    // Handle unsuccessful HTTP status codes (e.g., 4xx, 5xx)
-                    Err(SearchError::HttpError(format!(
-                        "Request failed with status code: {}",
-                        status_code
-                    )))
-                }
-            }
-            Err(err) => {
-                // Handle error from the request itself
-                Err(SearchError::HttpError(err.to_string()))
-            }
+        let mut query_args: HashMap<String, JsonValue> = HashMap::new();
+        query_args.insert("from".into(), JsonValue::Number(query.from.into()));
+        query_args.insert("size".into(), JsonValue::Number(query.size.into()));
+        for (key, value) in query.query_strings {
+            query_args.insert(key, JsonValue::String(value));
         }
+
+        let response = HttpClient::get(
+            &self.server.id,
+            &url,
+            Some(query_args),
+        )
+            .await
+            .map_err(|e| SearchError::HttpError(format!("Error to send search request: {}", e)))?;
+
+        // Use the helper function to parse the response body
+        let response_body = get_response_body_text(response)
+            .await
+            .map_err(|e| SearchError::ParseError(format!("Failed to read response body: {}", e)))?;
+
+        // Parse the search response from the body text
+        let parsed: SearchResponse<Document> = serde_json::from_str(&response_body)
+            .map_err(|e| SearchError::ParseError(format!("Failed to parse search response: {}", e)))?;
+
+        // Process the parsed response
+        let total_hits = parsed.hits.total.value as usize;
+        let hits: Vec<(Document, f64)> = parsed
+            .hits
+            .hits
+            .into_iter()
+            .map(|hit| (hit._source, hit._score.unwrap_or(0.0))) // Default _score to 0.0 if None
+            .collect();
+
+        // Return the final result
+        Ok(QueryResponse {
+            source: self.get_type(),
+            hits,
+            total_hits,
+        })
     }
 }

src-tauri/src/server/servers.rs

@@ -1,12 +1,13 @@
+use crate::common::http::get_response_body_text;
 use crate::common::register::SearchSourceRegistry;
 use crate::common::server::{AuthProvider, Provider, Server, ServerAccessToken, Sso, Version};
 use crate::server::connector::fetch_connectors_by_server;
-use crate::server::datasource::get_datasources_by_server;
+use crate::server::datasource::datasource_search;
 use crate::server::http_client::HttpClient;
 use crate::server::search::CocoSearchSource;
 use crate::COCO_TAURI_STORE;
 use lazy_static::lazy_static;
-use reqwest::{Client, Method, StatusCode};
+use reqwest::Method;
 use serde_json::from_value;
 use serde_json::Value as JsonValue;
 use std::collections::HashMap;
@@ -298,61 +299,57 @@ pub async fn refresh_coco_server_info<R: Runtime>(
     id: String,
 ) -> Result<Server, String> {
     // Retrieve the server from the cache
-    let server = {
+    let cached_server = {
         let cache = SERVER_CACHE.read().unwrap();
         cache.get(&id).cloned()
     };
 
-    if let Some(server) = server {
-        let is_enabled = server.enabled;
-        let is_builtin = server.builtin;
-        let profile = server.profile;
+    let server = match cached_server {
+        Some(server) => server,
+        None => return Err("Server not found.".into()),
+    };
 
-        // Use the HttpClient to send the request
-        let response = HttpClient::get(&id, "/provider/_info", None) // Assuming "/provider-info" is the endpoint
-            .await
-            .map_err(|e| format!("Failed to send request to the server: {}", e))?;
+    // Preserve important local state
+    let is_enabled = server.enabled;
+    let is_builtin = server.builtin;
+    let profile = server.profile;
 
-        if response.status() == StatusCode::OK {
-            if let Some(content_length) = response.content_length() {
-                if content_length > 0 {
-                    let new_coco_server: Result<Server, _> = response.json().await;
-                    match new_coco_server {
-                        Ok(mut server) => {
-                            server.id = id.clone();
-                            server.builtin = is_builtin;
-                            server.enabled = is_enabled;
-                            server.available = true;
-                            server.profile = profile;
-                            trim_endpoint_last_forward_slash(&mut server);
-                            save_server(&server);
-                            persist_servers(&app_handle)
-                                .await
-                                .expect("Failed to persist coco servers.");
+    // Send request to fetch updated server info
+    let response = HttpClient::get(&id, "/provider/_info", None)
+        .await
+        .map_err(|e| format!("Failed to contact the server: {}", e))?;
 
-                            //refresh connectors and datasources
-                            let _ = fetch_connectors_by_server(&id).await;
-
-                            let _ = get_datasources_by_server(&id).await;
-
-                            Ok(server)
-                        }
-                        Err(e) => Err(format!("Failed to deserialize the response: {:?}", e)),
-                    }
-                } else {
-                    Err("Received empty response body.".to_string())
-                }
-            } else {
-                mark_server_as_offline(id.as_str()).await;
-                Err("Could not determine the content length.".to_string())
-            }
-        } else {
-            mark_server_as_offline(id.as_str()).await;
-            Err(format!("Request failed with status: {}", response.status()))
-        }
-    } else {
-        Err("Server not found.".to_string())
+    if !response.status().is_success() {
+        mark_server_as_offline(&id).await;
+        return Err(format!("Request failed with status: {}", response.status()));
     }
+
+    // Get body text via helper
+    let body = get_response_body_text(response).await?;
+
+    // Deserialize server
+    let mut updated_server: Server = serde_json::from_str(&body)
+        .map_err(|e| format!("Failed to deserialize the response: {}", e))?;
+
+    // Restore local state
+    updated_server.id = id.clone();
+    updated_server.builtin = is_builtin;
+    updated_server.enabled = is_enabled;
+    updated_server.available = true;
+    updated_server.profile = profile;
+    trim_endpoint_last_forward_slash(&mut updated_server);
+
+    // Save and persist
+    save_server(&updated_server);
+    persist_servers(&app_handle)
+        .await
+        .map_err(|e| format!("Failed to persist servers: {}", e))?;
+
+    // Refresh connectors and datasources (best effort)
+    let _ = fetch_connectors_by_server(&id).await;
+    let _ = datasource_search(&id, None).await;
+
+    Ok(updated_server)
 }
 
 #[tauri::command]
@@ -362,12 +359,10 @@ pub async fn add_coco_server<R: Runtime>(
 ) -> Result<Server, String> {
     load_or_insert_default_server(&app_handle)
         .await
-        .expect("Failed to load default servers");
+        .map_err(|e| format!("Failed to load default servers: {}", e))?;
 
-    // Remove the trailing '/' from the endpoint to ensure correct URL construction
     let endpoint = endpoint.trim_end_matches('/');
 
-    // Check if the server with this endpoint already exists
     if check_endpoint_exists(endpoint) {
         dbg!(format!(
             "This Coco server has already been registered: {:?}",
@@ -376,59 +371,37 @@ pub async fn add_coco_server<R: Runtime>(
         return Err("This Coco server has already been registered.".into());
     }
 
-    let url = provider_info_url(&endpoint);
-
-    // Use the HttpClient to fetch provider information
+    let url = provider_info_url(endpoint);
     let response = HttpClient::send_raw_request(Method::GET, url.as_str(), None, None, None)
         .await
         .map_err(|e| format!("Failed to send request to the server: {}", e))?;
 
     dbg!(format!("Get provider info response: {:?}", &response));
 
-    // Check if the response status is OK (200)
-    if response.status() == StatusCode::OK {
-        if let Some(content_length) = response.content_length() {
-            if content_length > 0 {
-                let new_coco_server: Result<Server, _> = response.json().await;
+    let body = get_response_body_text(response).await?;
 
-                match new_coco_server {
-                    Ok(mut server) => {
-                        // Perform necessary checks and adjustments on the server data
-                        trim_endpoint_last_forward_slash(&mut server);
+    let mut server: Server = serde_json::from_str(&body)
+        .map_err(|e| format!("Failed to deserialize the response: {}", e))?;
 
-                        if server.id.is_empty() {
-                            server.id = pizza_common::utils::uuid::Uuid::new().to_string();
-                        }
+    trim_endpoint_last_forward_slash(&mut server);
 
-                        if server.name.is_empty() {
-                            server.name = "Coco Cloud".to_string();
-                        }
-
-                        // Save the new server to the cache
-                        save_server(&server);
-
-                        // Register the server to the search source
-                        try_register_server_to_search_source(app_handle.clone(), &server).await;
-
-                        // Persist the servers to the store
-                        persist_servers(&app_handle)
-                            .await
-                            .expect("Failed to persist Coco servers.");
-
-                        dbg!(format!("Successfully registered server: {:?}", &endpoint));
-                        Ok(server)
-                    }
-                    Err(e) => Err(format!("Failed to deserialize the response: {}", e)),
-                }
-            } else {
-                Err("Received empty response body.".to_string())
-            }
-        } else {
-            Err("Could not determine the content length.".to_string())
-        }
-    } else {
-        Err(format!("Request failed with status: {}", response.status()))
+    if server.id.is_empty() {
+        server.id = pizza_common::utils::uuid::Uuid::new().to_string();
     }
+
+    if server.name.is_empty() {
+        server.name = "Coco Server".to_string();
+    }
+
+    save_server(&server);
+    try_register_server_to_search_source(app_handle.clone(), &server).await;
+
+    persist_servers(&app_handle)
+        .await
+        .map_err(|e| format!("Failed to persist Coco servers: {}", e))?;
+
+    dbg!(format!("Successfully registered server: {:?}", &endpoint));
+    Ok(server)
 }
 
 #[tauri::command]
@@ -474,7 +447,7 @@ pub async fn try_register_server_to_search_source(
 ) {
     if server.enabled {
         let registry = app_handle.state::<SearchSourceRegistry>();
-        let source = CocoSearchSource::new(server.clone(), Client::new());
+        let source = CocoSearchSource::new(server.clone());
         registry.register_source(source).await;
     }
 }

src-tauri/src/server/system_settings.rs

@@ -0,0 +1,15 @@
+use crate::server::http_client::HttpClient;
+use serde_json::Value;
+use tauri::command;
+
+#[command]
+pub async fn get_system_settings(server_id: String) -> Result<Value, String> {
+    let response = HttpClient::get(&server_id, "/settings", None)
+        .await
+        .map_err(|err| err.to_string())?;
+
+    response
+        .json::<Value>()
+        .await
+        .map_err(|err| err.to_string())
+}

src-tauri/src/server/transcription.rs

@@ -1,3 +1,4 @@
+use crate::common::http::get_response_body_text;
 use crate::server::http_client::HttpClient;
 use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;
@@ -19,23 +20,24 @@ pub async fn transcription(
     query_params.insert("type".to_string(), JsonValue::String(audio_type));
     query_params.insert("content".to_string(), JsonValue::String(audio_content));
 
+    // Send the HTTP POST request
     let response = HttpClient::post(
         &server_id,
         "/services/audio/transcription",
         Some(query_params),
         None,
     )
-    .await?;
+        .await
+        .map_err(|e| format!("Error sending transcription request: {}", e))?;
 
-    if response.status().is_success() {
-        response
-            .json::<TranscriptionResponse>()
-            .await
-            .map_err(|e| e.to_string())
-    } else {
-        Err(format!(
-            "Transcription failed with status: {}",
-            response.status()
-        ))
-    }
+    // Use get_response_body_text to extract the response body as text
+    let response_body = get_response_body_text(response)
+        .await
+        .map_err(|e| format!("Failed to read response body: {}", e))?;
+
+    // Deserialize the response body into TranscriptionResponse
+    let transcription_response: TranscriptionResponse = serde_json::from_str(&response_body)
+        .map_err(|e| format!("Failed to parse transcription response: {}", e))?;
+
+    Ok(transcription_response)
 }

src-tauri/src/server/websocket.rs

@@ -2,14 +2,14 @@ use crate::server::servers::{get_server_by_id, get_server_token};
 use futures::StreamExt;
 use std::collections::HashMap;
 use std::sync::Arc;
-use tauri::{AppHandle, Emitter};
+use tauri::{AppHandle, Emitter, Runtime};
 use tokio::net::TcpStream;
 use tokio::sync::{mpsc, Mutex};
 use tokio_tungstenite::tungstenite::handshake::client::generate_key;
 use tokio_tungstenite::tungstenite::Message;
+use tokio_tungstenite::MaybeTlsStream;
 use tokio_tungstenite::WebSocketStream;
-use tokio_tungstenite::{connect_async, MaybeTlsStream};
-
+use tokio_tungstenite::{connect_async_tls_with_config, Connector};
 #[derive(Default)]
 pub struct WebSocketManager {
     connections: Arc<Mutex<HashMap<String, Arc<WebSocketInstance>>>>,
@@ -22,9 +22,15 @@ struct WebSocketInstance {
 
 fn convert_to_websocket(endpoint: &str) -> Result<String, String> {
     let url = url::Url::parse(endpoint).map_err(|e| format!("Invalid URL: {}", e))?;
-    let ws_protocol = if url.scheme() == "https" { "wss://" } else { "ws://" };
+    let ws_protocol = if url.scheme() == "https" {
+        "wss://"
+    } else {
+        "ws://"
+    };
     let host = url.host_str().ok_or("No host found in URL")?;
-    let port = url.port_or_known_default().unwrap_or(if url.scheme() == "https" { 443 } else { 80 });
+    let port = url
+        .port_or_known_default()
+        .unwrap_or(if url.scheme() == "https" { 443 } else { 80 });
 
     let ws_endpoint = if port == 80 || port == 443 {
         format!("{}{}{}", ws_protocol, host, "/ws")
@@ -35,7 +41,8 @@ fn convert_to_websocket(endpoint: &str) -> Result<String, String> {
 }
 
 #[tauri::command]
-pub async fn connect_to_server(
+pub async fn connect_to_server<R: Runtime>(
+    tauri_app_handle: AppHandle<R>,
     id: String,
     client_id: String,
     state: tauri::State<'_, WebSocketManager>,
@@ -54,16 +61,43 @@ pub async fn connect_to_server(
         tokio_tungstenite::tungstenite::client::IntoClientRequest::into_client_request(&endpoint)
             .map_err(|e| format!("Failed to create WebSocket request: {}", e))?;
 
-    request.headers_mut().insert("Connection", "Upgrade".parse().unwrap());
-    request.headers_mut().insert("Upgrade", "websocket".parse().unwrap());
-    request.headers_mut().insert("Sec-WebSocket-Version", "13".parse().unwrap());
-    request.headers_mut().insert("Sec-WebSocket-Key", generate_key().parse().unwrap());
+    request
+        .headers_mut()
+        .insert("Connection", "Upgrade".parse().unwrap());
+    request
+        .headers_mut()
+        .insert("Upgrade", "websocket".parse().unwrap());
+    request
+        .headers_mut()
+        .insert("Sec-WebSocket-Version", "13".parse().unwrap());
+    request
+        .headers_mut()
+        .insert("Sec-WebSocket-Key", generate_key().parse().unwrap());
 
     if let Some(token) = token {
-        request.headers_mut().insert("X-API-TOKEN", token.parse().unwrap());
+        request
+            .headers_mut()
+            .insert("X-API-TOKEN", token.parse().unwrap());
     }
 
-    let (ws_stream, _) = connect_async(request).await.map_err(|e| format!("WebSocket error: {:?}", e))?;
+    let allow_self_signature =
+        crate::settings::get_allow_self_signature(tauri_app_handle.clone()).await;
+    let tls_connector = tokio_native_tls::native_tls::TlsConnector::builder()
+        .danger_accept_invalid_certs(allow_self_signature)
+        .build()
+        .map_err(|e| format!("TLS build error: {:?}", e))?;
+
+    let connector = Connector::NativeTls(tls_connector.into());
+
+    let (ws_stream, _) = connect_async_tls_with_config(
+        request,
+        None,            // WebSocketConfig
+        true,            // disable_nagle
+        Some(connector), // Connector
+    )
+    .await
+    .map_err(|e| format!("WebSocket TLS error: {:?}", e))?;
+
     let (cancel_tx, mut cancel_rx) = mpsc::channel(1);
 
     let instance = Arc::new(WebSocketInstance {
@@ -112,9 +146,11 @@ pub async fn connect_to_server(
     Ok(())
 }
 
-
 #[tauri::command]
-pub async fn disconnect(client_id: String, state: tauri::State<'_, WebSocketManager>) -> Result<(), String> {
+pub async fn disconnect(
+    client_id: String,
+    state: tauri::State<'_, WebSocketManager>,
+) -> Result<(), String> {
     let instance = {
         let mut connections = state.connections.lock().await;
         connections.remove(&client_id)
@@ -129,4 +165,4 @@ pub async fn disconnect(client_id: String, state: tauri::State<'_, WebSocketMana
     }
 
     Ok(())
-}
+}

src-tauri/src/settings.rs

@@ -0,0 +1,72 @@
+use crate::COCO_TAURI_STORE;
+use serde_json::Value as Json;
+use tauri::{AppHandle, Runtime};
+use tauri_plugin_store::StoreExt;
+
+const SETTINGS_ALLOW_SELF_SIGNATURE: &str = "settings_allow_self_signature";
+
+#[tauri::command]
+pub async fn set_allow_self_signature<R: Runtime>(tauri_app_handle: AppHandle<R>, value: bool) {
+    use crate::server::http_client;
+
+    let store = tauri_app_handle
+        .store(COCO_TAURI_STORE)
+        .unwrap_or_else(|e| {
+            panic!(
+                "store [{}] not found/loaded, error [{}]",
+                COCO_TAURI_STORE, e
+            )
+        });
+
+    let old_value = match store
+        .get(SETTINGS_ALLOW_SELF_SIGNATURE)
+        .expect("should be initialized upon first get call")
+    {
+        Json::Bool(b) => b,
+        _ => unreachable!(
+            "{} should be stored in a boolean",
+            SETTINGS_ALLOW_SELF_SIGNATURE
+        ),
+    };
+
+    if old_value == value {
+        return;
+    }
+
+    store.set(SETTINGS_ALLOW_SELF_SIGNATURE, value);
+
+    let mut guard = http_client::HTTP_CLIENT.lock().await;
+    *guard = http_client::new_reqwest_http_client(value)
+}
+
+/// Synchronous version of `async get_allow_self_signature()`.
+pub fn _get_allow_self_signature<R: Runtime>(tauri_app_handle: AppHandle<R>) -> bool {
+    let store = tauri_app_handle
+        .store(COCO_TAURI_STORE)
+        .unwrap_or_else(|e| {
+            panic!(
+                "store [{}] not found/loaded, error [{}]",
+                COCO_TAURI_STORE, e
+            )
+        });
+    if !store.has(SETTINGS_ALLOW_SELF_SIGNATURE) {
+        // default to false
+        store.set(SETTINGS_ALLOW_SELF_SIGNATURE, false);
+    }
+
+    match store
+        .get(SETTINGS_ALLOW_SELF_SIGNATURE)
+        .expect("should be Some")
+    {
+        Json::Bool(b) => b,
+        _ => unreachable!(
+            "{} should be stored in a boolean",
+            SETTINGS_ALLOW_SELF_SIGNATURE
+        ),
+    }
+}
+
+#[tauri::command]
+pub async fn get_allow_self_signature<R: Runtime>(tauri_app_handle: AppHandle<R>) -> bool {
+    _get_allow_self_signature(tauri_app_handle)
+}

src-tauri/src/setup/mac.rs

@@ -1,9 +1,6 @@
 //credits to: https://github.com/ayangweb/ayangweb-EcoPaste/blob/169323dbe6365ffe4abb64d867439ed2ea84c6d1/src-tauri/src/core/setup/mac.rs
 use tauri::{ActivationPolicy, App, Emitter, EventTarget, WebviewWindow};
-use tauri_nspanel::{
-    cocoa::appkit::{NSMainMenuWindowLevel, NSWindowCollectionBehavior},
-    panel_delegate, WebviewWindowExt,
-};
+use tauri_nspanel::{cocoa::appkit::NSWindowCollectionBehavior, panel_delegate, WebviewWindowExt};
 
 use crate::common::MAIN_WINDOW_LABEL;
 
@@ -22,7 +19,7 @@ pub fn platform(app: &mut App, main_window: WebviewWindow, _settings_window: Web
     let panel = main_window.to_panel().unwrap();
 
     // Make the window above the dock
-    panel.set_level(NSMainMenuWindowLevel + 1);
+    panel.set_level(20);
 
     // Do not steal focus from other windows
     panel.set_style_mask(NSWindowStyleMaskNonActivatingPanel);

src-tauri/src/setup/mod.rs

@@ -20,7 +20,7 @@ pub use linux::*;
 
 pub fn default(app: &mut App, main_window: WebviewWindow, settings_window: WebviewWindow) {
     // Development mode automatically opens the console: https://tauri.app/develop/debug
-    #[cfg(any(dev, debug_assertions))]
+    #[cfg(all(dev, debug_assertions))]
     main_window.open_devtools();
 
     platform(app, main_window.clone(), settings_window.clone());

src-tauri/src/setup/windows.rs

@@ -1,3 +1,3 @@
 use tauri::{App, WebviewWindow};
 
-pub fn platform(_app: &mut App, _main_window: WebviewWindow, _settings_window: WebviewWindow) {}
+pub fn platform(_app: &mut App, _main_window: WebviewWindow, _settings_window: WebviewWindow) {}

src-tauri/src/util/mod.rs

@@ -0,0 +1,86 @@
+use std::{path::Path, process::Command};
+use tauri::{AppHandle, Runtime};
+use tauri_plugin_shell::ShellExt;
+
+enum LinuxDesktopEnvironment {
+    Gnome,
+    Kde,
+}
+
+impl LinuxDesktopEnvironment {
+    // This impl is based on: https://wiki.archlinux.org/title/Desktop_entries#Usage
+    fn launch_app_via_desktop_file<P: AsRef<Path>>(&self, file: P) -> Result<(), String> {
+        let path = file.as_ref();
+        if !path.try_exists().map_err(|e| e.to_string())? {
+            return Err(format!("desktop file [{}] does not exist", path.display()));
+        }
+
+        let cmd_output = match self {
+            Self::Gnome => {
+                let uri = path
+                    .file_stem()
+                    .expect("the desktop file should contain a file stem part");
+
+                Command::new("gtk-launch")
+                    .arg(uri)
+                    .output()
+                    .map_err(|e| e.to_string())?
+            }
+            Self::Kde => Command::new("kde-open")
+                .arg(path)
+                .output()
+                .map_err(|e| e.to_string())?,
+        };
+
+        if !cmd_output.status.success() {
+            return Err(format!(
+                "failed to launch app via desktop file [{}], underlying command stderr [{}]",
+                path.display(),
+                String::from_utf8_lossy(&cmd_output.stderr)
+            ));
+        }
+
+        Ok(())
+    }
+}
+
+fn get_linux_desktop_environment() -> Option<LinuxDesktopEnvironment> {
+    let de_os_str = std::env::var_os("XDG_CURRENT_DESKTOP")?;
+    let de_str = de_os_str
+        .into_string()
+        .expect("$XDG_CURRENT_DESKTOP should be UTF-8 encoded");
+
+    let de = match de_str.as_str() {
+        "GNOME" => LinuxDesktopEnvironment::Gnome,
+        "KDE" => LinuxDesktopEnvironment::Kde,
+
+        unsupported_de => unimplemented!(
+            "This desktop environment [{}] has not been supported yet",
+            unsupported_de
+        ),
+    };
+
+    Some(de)
+}
+
+/// Homemade open() function to support open Linux applications via the `.desktop` file.
+//
+// tauri_plugin_shell::open() is deprecated, but we still use it.
+#[allow(deprecated)]
+#[tauri::command]
+pub async fn open<R: Runtime>(app_handle: AppHandle<R>, path: String) -> Result<(), String> {
+    if cfg!(target_os = "linux") {
+        let borrowed_path = Path::new(&path);
+        if let Some(file_extension) = borrowed_path.extension() {
+            if file_extension == "desktop" {
+                let desktop_environment = get_linux_desktop_environment().expect("The Linux OS is running without a desktop, Coco could never run in such a environment");
+                return desktop_environment.launch_app_via_desktop_file(path);
+            }
+        }
+    }
+
+    app_handle
+        .shell()
+        .open(path, None)
+        .map_err(|e| e.to_string())
+}

src-tauri/tauri.conf.json

@@ -31,7 +31,7 @@
         "visible": false,
         "windowEffects": {
           "effects": [],
-          "radius": 12
+          "radius": 6
         },
         "visibleOnAllWorkspaces": true,
         "alwaysOnTop": true

src/api/attachment.ts

@@ -1,73 +0,0 @@
-import { invoke } from "@tauri-apps/api/core";
-
-interface UploadAttachmentPayload {
-  serverId: string;
-  sessionId: string;
-  filePaths: string[];
-}
-
-interface UploadAttachmentResponse {
-  acknowledged: boolean;
-  attachments: string[];
-}
-
-type GetAttachmentPayload = Omit<UploadAttachmentPayload, "filePaths">;
-
-export interface AttachmentHit {
-  _index: string;
-  _type: string;
-  _id: string;
-  _score: number;
-  _source: {
-    id: string;
-    created: string;
-    updated: string;
-    session: string;
-    name: string;
-    icon: string;
-    url: string;
-    size: number;
-  };
-}
-
-interface GetAttachmentResponse {
-  took: number;
-  timed_out: boolean;
-  _shards: {
-    total: number;
-    successful: number;
-    skipped: number;
-    failed: number;
-  };
-  hits: {
-    total: {
-      value: number;
-      relation: string;
-    };
-    max_score: number;
-    hits: AttachmentHit[];
-  };
-}
-
-interface DeleteAttachmentPayload {
-  serverId: string;
-  id: string;
-}
-
-export const uploadAttachment = async (payload: UploadAttachmentPayload) => {
-  const response = await invoke<UploadAttachmentResponse>("upload_attachment", {
-    ...payload,
-  });
-
-  if (response?.acknowledged) {
-    return response.attachments;
-  }
-};
-
-export const getAttachment = (payload: GetAttachmentPayload) => {
-  return invoke<GetAttachmentResponse>("get_attachment", { ...payload });
-};
-
-export const deleteAttachment = (payload: DeleteAttachmentPayload) => {
-  return invoke<boolean>("delete_attachment", { ...payload });
-};

src/api/axiosRequest.ts

@@ -0,0 +1,124 @@
+import axios from "axios";
+
+import { useAppStore } from "@/stores/appStore";
+
+import {
+  handleChangeRequestHeader,
+  handleConfigureAuth,
+  // handleAuthError,
+  // handleGeneralError,
+  handleNetworkError,
+} from "./tools";
+
+type Fn = (data: FcResponse<any>) => unknown;
+
+interface IAnyObj {
+  [index: string]: unknown;
+}
+
+interface FcResponse<T> {
+  errno: string;
+  errmsg: string;
+  data: T;
+}
+
+axios.interceptors.request.use((config) => {
+  config = handleChangeRequestHeader(config);
+  config = handleConfigureAuth(config);
+  // console.log("config", config);
+  return config;
+});
+
+axios.interceptors.response.use(
+  (response) => {
+    if (response.status !== 200) return Promise.reject(response.data);
+    // handleAuthError(response.data.errno);
+    // handleGeneralError(response.data.errno, response.data.errmsg);
+    return response;
+  },
+  (err) => {
+    handleNetworkError(err?.response?.status);
+    return Promise.reject(err?.response);
+  }
+);
+
+export const handleApiError = (error: any) => {
+  const addError = useAppStore.getState().addError;
+
+  let message = "Request failed";
+
+  if (error.response) {
+    // Server error response
+    message =
+      error.response.data?.message || `Error (${error.response.status})`;
+  } else if (error.request) {
+    // Request failed to send
+    message = "Network connection failed";
+  } else {
+    // Other errors
+    message = error.message;
+  }
+
+  console.error(error);
+  addError(message, "error");
+  return error;
+};
+
+export const Get = <T>(
+  url: string,
+  params: IAnyObj = {},
+  clearFn?: Fn
+): Promise<[any, FcResponse<T> | undefined]> =>
+  new Promise((resolve) => {
+    const appStore = JSON.parse(localStorage.getItem("app-store") || "{}");
+
+    let baseURL = appStore.state?.endpoint_http;
+    if (!baseURL || baseURL === "undefined") {
+      baseURL = "";
+    }
+
+    axios
+      .get(baseURL + url, { params })
+      .then((result) => {
+        let res: FcResponse<T>;
+        if (clearFn !== undefined) {
+          res = clearFn(result?.data) as unknown as FcResponse<T>;
+        } else {
+          res = result?.data as FcResponse<T>;
+        }
+        resolve([null, res as FcResponse<T>]);
+      })
+      .catch((err) => {
+        handleApiError(err);
+        resolve([err, undefined]);
+      });
+  });
+
+export const Post = <T>(
+  url: string,
+  data: IAnyObj,
+  params: IAnyObj = {},
+  headers: IAnyObj = {}
+): Promise<[any, FcResponse<T> | undefined]> => {
+  return new Promise((resolve) => {
+    const appStore = JSON.parse(localStorage.getItem("app-store") || "{}");
+
+    let baseURL = appStore.state?.endpoint_http
+    if (!baseURL || baseURL === "undefined") {
+      baseURL = "";
+    }
+
+    axios
+      .post(baseURL + url, data, {
+        params,
+        headers,
+      } as any)
+      .then((result) => {
+        resolve([null, result.data as FcResponse<T>]);
+      })
+      .catch((err) => {
+        handleApiError(err);
+        resolve([err, undefined]);
+      });
+  });
+};

src/api/tools.ts

@@ -0,0 +1,73 @@
+export const handleChangeRequestHeader = (config: any) => {
+  config["xxxx"] = "xxx";
+  return config;
+};
+
+export const handleConfigureAuth = (config: any) => {
+  // config.headers["X-API-TOKEN"] = localStorage.getItem("token") || "";
+
+  const headersStr = localStorage.getItem("headers") || "{}";
+    const headers = JSON.parse(headersStr);
+    // console.log("headers:", headers);
+
+  config.headers = {
+    ...config.headers,
+    ...headers,
+  }
+  // console.log("config.headers", config.headers)
+  return config;
+};
+
+export const handleNetworkError = (errStatus?: number): void => {
+  const networkErrMap: any = {
+    "400": "Bad Request", // token invalid
+    "401": "Unauthorized, please login again",
+    "403": "Access Denied",
+    "404": "Resource Not Found",
+    "405": "Method Not Allowed",
+    "408": "Request Timeout",
+    "500": "Internal Server Error",
+    "501": "Not Implemented",
+    "502": "Bad Gateway",
+    "503": "Service Unavailable",
+    "504": "Gateway Timeout",
+    "505": "HTTP Version Not Supported",
+  };
+  if (errStatus) {
+    console.error(networkErrMap[errStatus] ?? `Other Connection Error --${errStatus}`);
+    return;
+  }
+
+  console.error("Unable to connect to server!");
+};
+
+export const handleAuthError = (errno: string): boolean => {
+  const authErrMap: any = {
+    "10031": "Login expired, please login again", // token invalid
+    "10032": "Session timeout, please login again", // token expired
+    "10033": "Account not bound to role, please contact administrator",
+    "10034": "User not registered, please contact administrator",
+    "10035": "Unable to get third-party platform user with code",
+    "10036": "Account not linked to employee, please contact administrator",
+    "10037": "Account is invalid",
+    "10038": "Account not found",
+  };
+
+  if (authErrMap.hasOwnProperty(errno)) {
+    console.error(authErrMap[errno]);
+    // Authorization error, logout account
+    // logout();
+    return false;
+  }
+
+  return true;
+};
+
+export const handleGeneralError = (errno: string, errmsg: string): boolean => {
+  if (errno !== "0") {
+    console.error(errmsg);
+    return false;
+  }
+
+  return true;
+};

src/api/transcription.ts

@@ -1,15 +0,0 @@
-import { invoke } from "@tauri-apps/api/core";
-
-interface TranscriptionPayload {
-  serverId: string;
-  audioType: string;
-  audioContent: string;
-}
-
-interface TranscriptionResponse {
-  text: string;
-}
-
-export const transcription = (payload: TranscriptionPayload) => {
-  return invoke<TranscriptionResponse>("transcription", { ...payload });
-};

src/commands/servers.ts

@@ -1,37 +1,86 @@
-import { invoke } from '@tauri-apps/api/core';
+import { invoke } from "@tauri-apps/api/core";
 
-import { ServerTokenResponse, Server, Connector, DataSource, GetResponse } from "@/types/commands"
+import {
+  ServerTokenResponse,
+  Server,
+  Connector,
+  DataSource,
+  GetResponse,
+  UploadAttachmentPayload,
+  UploadAttachmentResponse,
+  GetAttachmentPayload,
+  GetAttachmentResponse,
+  DeleteAttachmentPayload,
+  TranscriptionPayload,
+  TranscriptionResponse,
+  MultiSourceQueryResponse,
+} from "@/types/commands";
+import { useAppStore } from "@/stores/appStore";
+
+async function invokeWithErrorHandler<T>(
+  command: string,
+  args?: Record<string, any>
+): Promise<T> {
+  const addError = useAppStore.getState().addError;
+  try {
+    const result = await invoke<T>(command, args);
+    // console.log(command, result);
+
+    if (result && typeof result === "object" && "failed" in result) {
+      const failedResult = result as any;
+      if (failedResult.failed?.length > 0 && failedResult?.hits?.length == 0) {
+        failedResult.failed.forEach((error: any) => {
+          addError(error.error, 'error');
+          // console.error(error.error);
+        });
+      }
+    }
+
+    if (typeof result === "string") {
+      const res = JSON.parse(result);
+      if (typeof res === "string") {
+        throw new Error(result);
+      }
+    }
+
+    return result;
+  } catch (error: any) {
+    const errorMessage = error || "Command execution failed";
+    addError(command + ":" + errorMessage, "error");
+    throw error;
+  }
+}
 
 export function get_server_token(id: string): Promise<ServerTokenResponse> {
-  return invoke(`get_server_token`, { id });
+  return invokeWithErrorHandler(`get_server_token`, { id });
 }
 
 export function list_coco_servers(): Promise<Server[]> {
-  return invoke(`list_coco_servers`);
+  return invokeWithErrorHandler(`list_coco_servers`);
 }
 
 export function add_coco_server(endpoint: string): Promise<Server> {
-  return invoke(`add_coco_server`, { endpoint });
+  return invokeWithErrorHandler(`add_coco_server`, { endpoint });
 }
 
 export function enable_server(id: string): Promise<void> {
-  return invoke(`enable_server`, { id });
+  return invokeWithErrorHandler(`enable_server`, { id });
 }
 
 export function disable_server(id: string): Promise<void> {
-  return invoke(`disable_server`, { id });
+  return invokeWithErrorHandler(`disable_server`, { id });
 }
 
 export function remove_coco_server(id: string): Promise<void> {
-  return invoke(`remove_coco_server`, { id });
+  return invokeWithErrorHandler(`remove_coco_server`, { id });
 }
 
 export function logout_coco_server(id: string): Promise<void> {
-  return invoke(`logout_coco_server`, { id });
+  return invokeWithErrorHandler(`logout_coco_server`, { id });
 }
 
 export function refresh_coco_server_info(id: string): Promise<Server> {
-  return invoke(`refresh_coco_server_info`, { id });
+  return invokeWithErrorHandler(`refresh_coco_server_info`, { id });
 }
 
 export function handle_sso_callback({
@@ -43,7 +92,7 @@ export function handle_sso_callback({
   requestId: string;
   code: string;
 }): Promise<void> {
-  return invoke(`handle_sso_callback`, {
+  return invokeWithErrorHandler(`handle_sso_callback`, {
     serverId,
     requestId,
     code,
@@ -51,34 +100,41 @@ export function handle_sso_callback({
 }
 
 export function get_connectors_by_server(id: string): Promise<Connector[]> {
-  return invoke(`get_connectors_by_server`, { id });
+  return invokeWithErrorHandler(`get_connectors_by_server`, { id });
 }
 
-export function get_datasources_by_server(id: string): Promise<DataSource[]> {
-  return invoke(`get_datasources_by_server`, { id });
+export function datasource_search(id: string): Promise<DataSource[]> {
+  return invokeWithErrorHandler(`datasource_search`, { id });
+}
+
+export function mcp_server_search(id: string): Promise<DataSource[]> {
+  return invokeWithErrorHandler(`mcp_server_search`, { id });
 }
 
 export function connect_to_server(id: string, clientId: string): Promise<void> {
-  return invoke(`connect_to_server`, { id, clientId });
+  return invokeWithErrorHandler(`connect_to_server`, { id, clientId });
 }
 
 export function disconnect(clientId: string): Promise<void> {
-  return invoke(`disconnect`, { clientId });
+  return invokeWithErrorHandler(`disconnect`, { clientId });
 }
 
 export function chat_history({
   serverId,
   from = 0,
   size = 20,
+  query = "",
 }: {
   serverId: string;
   from?: number;
   size?: number;
+  query?: string;
 }): Promise<string> {
-  return invoke(`chat_history`, {
+  return invokeWithErrorHandler(`chat_history`, {
     serverId,
     from,
     size,
+    query,
   });
 }
 
@@ -93,7 +149,7 @@ export function session_chat_history({
   from?: number;
   size?: number;
 }): Promise<string> {
-  return invoke(`session_chat_history`, {
+  return invokeWithErrorHandler(`session_chat_history`, {
     serverId,
     sessionId,
     from,
@@ -108,7 +164,7 @@ export function close_session_chat({
   serverId: string;
   sessionId: string;
 }): Promise<string> {
-  return invoke(`close_session_chat`, {
+  return invokeWithErrorHandler(`close_session_chat`, {
     serverId,
     sessionId,
   });
@@ -121,7 +177,7 @@ export function open_session_chat({
   serverId: string;
   sessionId: string;
 }): Promise<string> {
-  return invoke(`open_session_chat`, {
+  return invokeWithErrorHandler(`open_session_chat`, {
     serverId,
     sessionId,
   });
@@ -134,7 +190,7 @@ export function cancel_session_chat({
   serverId: string;
   sessionId: string;
 }): Promise<string> {
-  return invoke(`cancel_session_chat`, {
+  return invokeWithErrorHandler(`cancel_session_chat`, {
     serverId,
     sessionId,
   });
@@ -151,7 +207,7 @@ export function new_chat({
   message: string;
   queryParams?: Record<string, any>;
 }): Promise<GetResponse> {
-  return invoke(`new_chat`, {
+  return invokeWithErrorHandler(`new_chat`, {
     serverId,
     websocketId,
     message,
@@ -172,11 +228,75 @@ export function send_message({
   message: string;
   queryParams?: Record<string, any>;
 }): Promise<string> {
-  return invoke(`send_message`, {
+  return invokeWithErrorHandler(`send_message`, {
     serverId,
     websocketId,
     sessionId,
     message,
     queryParams,
   });
-}
+}
+
+export const delete_session_chat = (serverId: string, sessionId: string) => {
+  return invokeWithErrorHandler<boolean>(`delete_session_chat`, {
+    serverId,
+    sessionId,
+  });
+};
+
+export const update_session_chat = (payload: {
+  serverId: string;
+  sessionId: string;
+  title?: string;
+  context?: {
+    attachments?: string[];
+  };
+}): Promise<boolean> => {
+  return invokeWithErrorHandler<boolean>("update_session_chat", payload);
+};
+
+export const assistant_search = (payload: {
+  serverId: string;
+}): Promise<boolean> => {
+  return invokeWithErrorHandler<boolean>("assistant_search", payload);
+};
+
+export const upload_attachment = async (payload: UploadAttachmentPayload) => {
+  const response = await invokeWithErrorHandler<UploadAttachmentResponse>(
+    "upload_attachment",
+    {
+      ...payload,
+    }
+  );
+
+  if (response?.acknowledged) {
+    return response.attachments;
+  }
+};
+
+export const get_attachment = (payload: GetAttachmentPayload) => {
+  return invokeWithErrorHandler<GetAttachmentResponse>("get_attachment", {
+    ...payload,
+  });
+};
+
+export const delete_attachment = (payload: DeleteAttachmentPayload) => {
+  return invokeWithErrorHandler<boolean>("delete_attachment", { ...payload });
+};
+
+export const transcription = (payload: TranscriptionPayload) => {
+  return invokeWithErrorHandler<TranscriptionResponse>("transcription", {
+    ...payload,
+  });
+};
+
+export const query_coco_fusion = (payload: {
+  from: number;
+  size: number;
+  queryStrings: Record<string, string>;
+  queryTimeout: number;
+}) => {
+  return invokeWithErrorHandler<MultiSourceQueryResponse>("query_coco_fusion", {
+    ...payload,
+  });
+};

src/components/Assistant/AssistantList.tsx

@@ -0,0 +1,407 @@
+import { useState, useRef, useCallback, useMemo } from "react";
+import {
+  ChevronDownIcon,
+  RefreshCw,
+  Check,
+  ChevronLeft,
+  ChevronRight,
+} from "lucide-react";
+import { useTranslation } from "react-i18next";
+
+import { useAppStore } from "@/stores/appStore";
+import logoImg from "@/assets/icon.svg";
+import platformAdapter from "@/utils/platformAdapter";
+import VisibleKey from "@/components/Common/VisibleKey";
+import { useConnectStore } from "@/stores/connectStore";
+import FontIcon from "@/components/Common/Icons/FontIcon";
+import { useChatStore } from "@/stores/chatStore";
+import { useShortcutsStore } from "@/stores/shortcutsStore";
+import { Post } from "@/api/axiosRequest";
+import { Popover, PopoverButton, PopoverPanel } from "@headlessui/react";
+import {
+  useAsyncEffect,
+  useDebounce,
+  useKeyPress,
+  usePagination,
+  useReactive,
+} from "ahooks";
+import clsx from "clsx";
+import NoDataImage from "../Common/NoDataImage";
+import PopoverInput from "../Common/PopoverInput";
+import { isNil } from "lodash-es";
+
+interface AssistantListProps {
+  assistantIDs?: string[];
+}
+
+interface State {
+  allAssistants: any[];
+}
+
+export function AssistantList({ assistantIDs = [] }: AssistantListProps) {
+  const { t } = useTranslation();
+  const { connected } = useChatStore();
+  const isTauri = useAppStore((state) => state.isTauri);
+  const setAssistantList = useConnectStore((state) => state.setAssistantList);
+  const currentService = useConnectStore((state) => state.currentService);
+  const currentAssistant = useConnectStore((state) => state.currentAssistant);
+  const setCurrentAssistant = useConnectStore((state) => {
+    return state.setCurrentAssistant;
+  });
+  const aiAssistant = useShortcutsStore((state) => state.aiAssistant);
+  const [assistants, setAssistants] = useState<any[]>([]);
+  const [isRefreshing, setIsRefreshing] = useState(false);
+  const popoverRef = useRef<HTMLDivElement>(null);
+  const popoverButtonRef = useRef<HTMLButtonElement>(null);
+  const searchInputRef = useRef<HTMLInputElement>(null);
+  const [keyword, setKeyword] = useState("");
+  const debounceKeyword = useDebounce(keyword, { wait: 500 });
+  const state = useReactive<State>({
+    allAssistants: [],
+  });
+
+  const currentServiceId = useMemo(() => {
+    return currentService?.id;
+  }, [connected, currentService?.id]);
+
+  const fetchAssistant = async (params: {
+    current: number;
+    pageSize: number;
+  }) => {
+    try {
+      const { pageSize, current } = params;
+
+      const from = (current - 1) * pageSize;
+      const size = pageSize;
+
+      let response: any;
+
+      const body: Record<string, any> = {
+        serverId: currentServiceId,
+        from,
+        size,
+      };
+
+      if (debounceKeyword || assistantIDs.length > 0) {
+        body.query = {
+          bool: {
+            must: [],
+          },
+        };
+        if (debounceKeyword) {
+          body.query.bool.must.push({
+            query_string: {
+              fields: ["combined_fulltext"],
+              query: debounceKeyword,
+              fuzziness: "AUTO",
+              fuzzy_prefix_length: 2,
+              fuzzy_max_expansions: 10,
+              fuzzy_transpositions: true,
+              allow_leading_wildcard: false,
+            },
+          });
+        }
+        if (assistantIDs.length > 0) {
+          body.query.bool.must.push({
+            terms: {
+              id: assistantIDs.map((id) => id),
+            },
+          });
+        }
+      }
+
+      if (isTauri) {
+        if (!currentServiceId) {
+          throw new Error("currentServiceId is undefined");
+        }
+
+        response = await platformAdapter.commands("assistant_search", body);
+      } else {
+        const [error, res] = await Post(`/assistant/_search`, body);
+
+        if (error) {
+          throw new Error(error);
+        }
+
+        response = res;
+      }
+
+      console.log("assistant_search", response);
+
+      let assistantList = response?.hits?.hits ?? [];
+
+      console.log("assistantList", assistantList);
+
+      for (const item of assistantList) {
+        const index = state.allAssistants.findIndex((allItem: any) => {
+          return item._id === allItem._id;
+        });
+
+        if (index === -1) {
+          state.allAssistants.push(item);
+        } else {
+          state.allAssistants[index] = item;
+        }
+      }
+
+      console.log("state.allAssistants", state.allAssistants);
+
+      const matched = state.allAssistants.find((item: any) => {
+        return item._id === currentAssistant?._id;
+      });
+
+      console.log("matched", matched);
+
+      if (matched) {
+        setCurrentAssistant(matched);
+      } else {
+        setCurrentAssistant(assistantList[0]);
+      }
+
+      return {
+        total: response.hits.total.value,
+        list: assistantList,
+      };
+    } catch (error) {
+      setCurrentAssistant(null);
+
+      console.error("assistant_search", error);
+
+      return {
+        total: 0,
+        list: [],
+      };
+    }
+  };
+
+  useAsyncEffect(async () => {
+    const data = await fetchAssistant({ current: 1, pageSize: 1000 });
+
+    setAssistantList(data.list);
+  }, [currentServiceId]);
+
+  const { pagination, runAsync } = usePagination(fetchAssistant, {
+    defaultPageSize: 5,
+    refreshDeps: [currentServiceId, debounceKeyword],
+    onSuccess(data) {
+      setAssistants(data.list);
+    },
+  });
+
+  const handleRefresh = async () => {
+    setIsRefreshing(true);
+
+    await runAsync({ current: 1, pageSize: 5 });
+
+    setTimeout(() => setIsRefreshing(false), 1000);
+  };
+
+  useKeyPress(
+    ["uparrow", "downarrow", "enter"],
+    (event, key) => {
+      const isClose = isNil(popoverButtonRef.current?.dataset["open"]);
+
+      if (isClose) return;
+
+      event.stopPropagation();
+      event.preventDefault();
+
+      if (key === "enter") {
+        return popoverButtonRef.current?.click();
+      }
+
+      const index = assistants.findIndex(
+        (item) => item._id === currentAssistant?._id
+      );
+      const length = assistants.length;
+
+      if (length <= 1) return;
+
+      let nextIndex = index;
+
+      if (key === "uparrow") {
+        nextIndex = index > 0 ? index - 1 : length - 1;
+      } else {
+        nextIndex = index < length - 1 ? index + 1 : 0;
+      }
+
+      setCurrentAssistant(assistants[nextIndex]);
+    },
+    {
+      target: popoverRef,
+    }
+  );
+
+  const handlePrev = useCallback(() => {
+    if (pagination.current <= 1) return;
+
+    pagination.changeCurrent(pagination.current - 1);
+  }, [pagination]);
+
+  const handleNext = useCallback(() => {
+    if (pagination.current >= pagination.totalPage) {
+      return;
+    }
+
+    pagination.changeCurrent(pagination.current + 1);
+  }, [pagination]);
+
+  return (
+    <div className="relative">
+      <Popover ref={popoverRef}>
+        <PopoverButton
+          ref={popoverButtonRef}
+          className="h-6  p-1 px-1.5 flex items-center gap-1 rounded-full bg-white dark:bg-[#202126] text-sm/6 font-semibold text-gray-800 dark:text-[#d8d8d8] border border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-none"
+        >
+          <div className="w-4 h-4 flex justify-center items-center rounded-full bg-white border border-[#E6E6E6]">
+            {currentAssistant?._source?.icon?.startsWith("font_") ? (
+              <FontIcon
+                name={currentAssistant._source.icon}
+                className="w-3 h-3"
+              />
+            ) : (
+              <img
+                src={logoImg}
+                className="w-3 h-3"
+                alt={t("assistant.message.logo")}
+              />
+            )}
+          </div>
+          <div className="max-w-[100px] truncate">
+            {currentAssistant?._source?.name || "Coco AI"}
+          </div>
+          <VisibleKey
+            shortcut={aiAssistant}
+            onKeyPress={() => {
+              popoverButtonRef.current?.click();
+            }}
+          >
+            <ChevronDownIcon className="size-4 text-gray-500 dark:text-gray-400 transition-transform" />
+          </VisibleKey>
+        </PopoverButton>
+
+        <PopoverPanel className="absolute z-50 top-full mt-1 left-0 w-60 rounded-xl bg-white dark:bg-[#202126] p-3 text-sm/6 text-[#333] dark:text-[#D8D8D8] shadow-lg border dark:border-white/10 focus:outline-none max-h-[calc(100vh-80px)] overflow-y-auto">
+          <div className="flex items-center justify-between text-sm font-bold">
+            <div>
+              {t("assistant.popover.title")}（{pagination.total}）
+            </div>
+
+            <button
+              onClick={handleRefresh}
+              className="flex items-center justify-center size-6 bg-white dark:bg-[#202126] rounded-lg border dark:border-white/10"
+              disabled={isRefreshing}
+            >
+              <VisibleKey shortcut="R" onKeyPress={handleRefresh}>
+                <RefreshCw
+                  className={clsx(
+                    "size-3 text-[#0287FF] transition-transform duration-1000",
+                    {
+                      "animate-spin": isRefreshing,
+                    }
+                  )}
+                />
+              </VisibleKey>
+            </button>
+          </div>
+
+          <VisibleKey
+            shortcut="F"
+            rootClassName="w-full my-3"
+            shortcutClassName="left-4"
+            onKeyPress={() => {
+              searchInputRef.current?.focus();
+            }}
+          >
+            <PopoverInput
+              ref={searchInputRef}
+              autoFocus
+              value={keyword}
+              placeholder={t("assistant.popover.search")}
+              className="w-full h-8 px-2 bg-transparent border rounded-md dark:border-white/10"
+              onChange={(event) => {
+                console.log("onChange", event.target.value);
+                setKeyword(event.target.value.trim());
+              }}
+            />
+          </VisibleKey>
+
+          {assistants.length > 0 ? (
+            <>
+              {assistants.map((assistant) => {
+                const { _id, _source, name } = assistant;
+
+                const isActive = currentAssistant?._id === _id;
+
+                return (
+                  <button
+                    key={_id}
+                    className={clsx(
+                      "w-full flex items-center h-[50px] gap-2 rounded-lg p-2 mb-1 hover:bg-[#E6E6E6] dark:hover:bg-[#1F2937] transition",
+                      {
+                        "bg-[#E6E6E6] dark:bg-[#1F2937]": isActive,
+                      }
+                    )}
+                    onClick={() => {
+                      setCurrentAssistant(assistant);
+                      popoverButtonRef.current?.click();
+                    }}
+                  >
+                    <div className="flex items-center justify-center size-6 bg-white border border-[#E6E6E6] rounded-full overflow-hidden">
+                      {_source?.icon?.startsWith("font_") ? (
+                        <FontIcon name={_source?.icon} className="size-4" />
+                      ) : (
+                        <img src={logoImg} className="size-4" alt={name} />
+                      )}
+                    </div>
+                    <div className="text-left flex-1 min-w-0">
+                      <div className="font-medium text-gray-900 dark:text-white truncate">
+                        {_source?.name || "-"}
+                      </div>
+                      <div className="text-xs text-gray-500 dark:text-gray-400 truncate">
+                        {_source?.description || ""}
+                      </div>
+                    </div>
+                    {isActive && (
+                      <div className="flex items-center">
+                        <VisibleKey
+                          shortcut="↓↑"
+                          shortcutClassName="w-6 -translate-x-4"
+                        >
+                          <Check className="w-4 h-4 text-gray-500 dark:text-gray-400" />
+                        </VisibleKey>
+                      </div>
+                    )}
+                  </button>
+                );
+              })}
+
+              <div className="flex items-center justify-between h-8 -mx-3 -mb-3 px-3 text-[#999] border-t dark:border-t-white/10">
+                <VisibleKey shortcut="leftarrow" onKeyPress={handlePrev}>
+                  <ChevronLeft
+                    className="size-4 cursor-pointer"
+                    onClick={handlePrev}
+                  />
+                </VisibleKey>
+
+                <div className="text-xs">
+                  {pagination.current}/{pagination.totalPage}
+                </div>
+
+                <VisibleKey shortcut="rightarrow" onKeyPress={handleNext}>
+                  <ChevronRight
+                    className="size-4 cursor-pointer"
+                    onClick={handleNext}
+                  />
+                </VisibleKey>
+              </div>
+            </>
+          ) : (
+            <div className="flex justify-center items-center py-2">
+              <NoDataImage />
+            </div>
+          )}
+        </PopoverPanel>
+      </Popover>
+    </div>
+  );
+}

src/components/Assistant/Chat.tsx

@@ -10,7 +10,6 @@ import {
 
 import { useChatStore } from "@/stores/chatStore";
 import { useConnectStore } from "@/stores/connectStore";
-import { useSearchStore } from "@/stores/searchStore";
 import { useWindows } from "@/hooks/useWindows";
 import useMessageChunkData from "@/hooks/useMessageChunkData";
 import useWebSocket from "@/hooks/useWebSocket";
@@ -21,11 +20,13 @@ import { ChatHeader } from "./ChatHeader";
 import { ChatContent } from "./ChatContent";
 import ConnectPrompt from "./ConnectPrompt";
 import type { Chat } from "./types";
+import PrevSuggestion from "@/components/ChatMessage/PrevSuggestion";
+import { useAppStore } from "@/stores/appStore";
 
 interface ChatAIProps {
-  isTransitioned: boolean;
   isSearchActive?: boolean;
   isDeepThinkActive?: boolean;
+  isMCPActive?: boolean;
   activeChatProp?: Chat;
   changeInput?: (val: string) => void;
   setIsSidebarOpen?: (value: boolean) => void;
@@ -33,6 +34,8 @@ interface ChatAIProps {
   clearChatPage?: () => void;
   isChatPage?: boolean;
   getFileUrl: (path: string) => string;
+  showChatHistory?: boolean;
+  assistantIDs?: string[];
 }
 
 export interface ChatAIRef {
@@ -46,21 +49,21 @@ const ChatAI = memo(
   forwardRef<ChatAIRef, ChatAIProps>(
     (
       {
-        isTransitioned,
         changeInput,
         isSearchActive,
         isDeepThinkActive,
+        isMCPActive,
         activeChatProp,
         setIsSidebarOpen,
         isSidebarOpen = false,
         clearChatPage,
         isChatPage = false,
         getFileUrl,
+        showChatHistory,
+        assistantIDs,
       },
       ref
     ) => {
-      if (!isTransitioned) return null;
-
       useImperativeHandle(ref, () => ({
         init: init,
         cancelChat: () => cancelChat(activeChat),
@@ -72,6 +75,11 @@ const ChatAI = memo(
         useChatStore();
 
       const currentService = useConnectStore((state) => state.currentService);
+      const visibleStartPage = useConnectStore((state) => {
+        return state.visibleStartPage;
+      });
+
+      const addError = useAppStore.getState().addError;
 
       const [activeChat, setActiveChat] = useState<Chat>();
       const [timedoutShow, setTimedoutShow] = useState(false);
@@ -81,7 +89,6 @@ const ChatAI = memo(
 
       const [isSidebarOpenChat, setIsSidebarOpenChat] = useState(isSidebarOpen);
       const [chats, setChats] = useState<Chat[]>([]);
-      const sourceDataIds = useSearchStore((state) => state.sourceDataIds);
 
       useEffect(() => {
         activeChatProp && setActiveChat(activeChatProp);
@@ -89,7 +96,7 @@ const ChatAI = memo(
 
       const [Question, setQuestion] = useState<string>("");
 
-      const [websocketSessionId, setWebsocketSessionId] = useState('');
+      const [websocketSessionId, setWebsocketSessionId] = useState("");
 
       const onWebsocketSessionId = useCallback((sessionId: string) => {
         setWebsocketSessionId(sessionId);
@@ -98,6 +105,7 @@ const ChatAI = memo(
       const {
         data: {
           query_intent,
+          tools,
           fetch_source,
           pick_source,
           deep_read,
@@ -110,6 +118,7 @@ const ChatAI = memo(
 
       const [loadingStep, setLoadingStep] = useState<Record<string, boolean>>({
         query_intent: false,
+        tools: false,
         fetch_source: false,
         pick_source: false,
         deep_read: false,
@@ -119,16 +128,15 @@ const ChatAI = memo(
 
       const dealMsgRef = useRef<((msg: string) => void) | null>(null);
 
-      const clientId = isChatPage ? "standalone" : "popup"
-      const { errorShow, setErrorShow, reconnect, disconnectWS, updateDealMsg } =
-        useWebSocket({
-          clientId,
-          connected,
-          setConnected,
-          currentService,
-          dealMsgRef,
-          onWebsocketSessionId,
-        });
+      const clientId = isChatPage ? "standalone" : "popup";
+      const { reconnect, updateDealMsg } = useWebSocket({
+        clientId,
+        connected,
+        setConnected,
+        currentService,
+        dealMsgRef,
+        onWebsocketSessionId,
+      });
 
       const {
         chatClose,
@@ -139,29 +147,33 @@ const ChatAI = memo(
         openSessionChat,
         getChatHistory,
         createChatWindow,
+        handleSearch,
+        handleRename,
+        handleDelete,
       } = useChatActions(
         currentService?.id,
         setActiveChat,
         setCurChatEnd,
-        setErrorShow,
         setTimedoutShow,
         clearAllChunkData,
         setQuestion,
         curIdRef,
+        setChats,
         isSearchActive,
         isDeepThinkActive,
-        sourceDataIds,
+        isMCPActive,
         changeInput,
-        websocketSessionId
+        websocketSessionId,
+        showChatHistory
       );
 
-      const { dealMsg, messageTimeoutRef } = useMessageHandler(
+      const { dealMsg } = useMessageHandler(
         curIdRef,
         setCurChatEnd,
         setTimedoutShow,
         (chat) => cancelChat(chat || activeChat),
         setLoadingStep,
-        handlers,
+        handlers
       );
 
       useEffect(() => {
@@ -172,33 +184,43 @@ const ChatAI = memo(
       }, [dealMsg, updateDealMsg]);
 
       const clearChat = useCallback(() => {
-        console.log("clearChat");
+        //console.log("clearChat");
         setTimedoutShow(false);
-        setErrorShow(false);
         chatClose(activeChat);
         setActiveChat(undefined);
         setCurChatEnd(true);
         clearChatPage && clearChatPage();
-      }, [
-        activeChat,
-        chatClose,
-        clearChatPage,
-        setCurChatEnd,
-        setErrorShow,
-        setTimedoutShow,
-      ]);
+      }, [activeChat, chatClose]);
 
       const init = useCallback(
-        (value: string) => {
-          if (!isLogin) return;
-          if (!curChatEnd) return;
-          if (!activeChat?._id) {
-            createNewChat(value, activeChat, websocketSessionId);
-          } else {
-            handleSendMessage(value, activeChat, websocketSessionId);
+        async (value: string) => {
+          try {
+            //console.log("init", isLogin, curChatEnd, activeChat?._id);
+            if (!isLogin) {
+              addError("Please login to continue chatting");
+              return;
+            }
+            if (!curChatEnd) {
+              addError("Please wait for the current conversation to complete");
+              return;
+            }
+            if (!activeChat?._id) {
+              await createNewChat(value, activeChat, websocketSessionId);
+            } else {
+              await handleSendMessage(value, activeChat, websocketSessionId);
+            }
+          } catch (error) {
+            console.error("Failed to initialize chat:", error);
           }
         },
-        [isLogin, curChatEnd, activeChat, createNewChat, handleSendMessage, websocketSessionId]
+        [
+          isLogin,
+          curChatEnd,
+          activeChat?._id,
+          createNewChat,
+          handleSendMessage,
+          websocketSessionId,
+        ]
       );
 
       const { createWin } = useWindows();
@@ -206,22 +228,9 @@ const ChatAI = memo(
         createChatWindow(createWin);
       }, [createChatWindow, createWin]);
 
-      useEffect(() => {
-        return () => {
-          if (messageTimeoutRef.current) {
-            clearTimeout(messageTimeoutRef.current);
-          }
-          chatClose(activeChat);
-          setActiveChat(undefined);
-          setCurChatEnd(true);
-          disconnectWS();
-        };
-      }, [chatClose, setCurChatEnd]);
-
       const onSelectChat = useCallback(
         async (chat: Chat) => {
           setTimedoutShow(false);
-          setErrorShow(false);
           clearAllChunkData();
           await cancelChat(activeChat);
           await chatClose(activeChat);
@@ -230,27 +239,29 @@ const ChatAI = memo(
             chatHistory(response);
           }
         },
-        [
-          clearAllChunkData,
-          cancelChat,
-          activeChat,
-          chatClose,
-          openSessionChat,
-          chatHistory,
-        ]
+        [cancelChat, activeChat, chatClose, openSessionChat, chatHistory]
       );
 
-      const deleteChat = useCallback((chatId: string) => {
-        setChats((prev) => prev.filter((chat) => chat._id !== chatId));
-        if (activeChat?._id === chatId) {
-          const remainingChats = chats.filter((chat) => chat._id !== chatId);
-          if (remainingChats.length > 0) {
-            setActiveChat(remainingChats[0]);
-          } else {
-            init("");
-          }
-        }
-      }, [activeChat, chats, init, setActiveChat]);
+      const deleteChat = useCallback(
+        (chatId: string) => {
+          handleDelete(chatId);
+
+          setChats((prev) => {
+            const updatedChats = prev.filter((chat) => chat._id !== chatId);
+
+            if (activeChat?._id === chatId) {
+              if (updatedChats.length > 0) {
+                setActiveChat(updatedChats[0]);
+              } else {
+                init("");
+              }
+            }
+
+            return updatedChats;
+          });
+        },
+        [activeChat?._id, handleDelete, init]
+      );
 
       const handleOutsideClick = useCallback((e: MouseEvent) => {
         const sidebar = document.querySelector("[data-sidebar]");
@@ -274,40 +285,56 @@ const ChatAI = memo(
         };
       }, [isSidebarOpenChat, handleOutsideClick]);
 
-      const fetchChatHistory = useCallback(async () => {
-        const hits = await getChatHistory();
-        setChats(hits);
-      }, [getChatHistory]);
-
-      const setIsLoginChat = useCallback(
-        (value: boolean) => {
-          setIsLogin(value);
-          value && currentService && !setIsSidebarOpen && fetchChatHistory();
-          !value && setChats([]);
-        },
-        [currentService, setIsSidebarOpen, fetchChatHistory]
-      );
-
       const toggleSidebar = useCallback(() => {
         setIsSidebarOpenChat(!isSidebarOpenChat);
         setIsSidebarOpen && setIsSidebarOpen(!isSidebarOpenChat);
-        !isSidebarOpenChat && fetchChatHistory();
-      }, [isSidebarOpenChat, setIsSidebarOpen, fetchChatHistory]);
+        !isSidebarOpenChat && getChatHistory();
+      }, [isSidebarOpenChat, setIsSidebarOpen, getChatHistory]);
+
+      const renameChat = useCallback(
+        (chatId: string, title: string) => {
+          setChats((prev) => {
+            const chatIndex = prev.findIndex((chat) => chat._id === chatId);
+            if (chatIndex === -1) return prev;
+
+            const modifiedChat = {
+              ...prev[chatIndex],
+              _source: { ...prev[chatIndex]._source, title },
+            };
+
+            const result = [...prev];
+            result.splice(chatIndex, 1);
+            return [modifiedChat, ...result];
+          });
+
+          if (activeChat?._id === chatId) {
+            setActiveChat((prev) => {
+              if (!prev) return prev;
+              return { ...prev, _source: { ...prev._source, title } };
+            });
+          }
+
+          handleRename(chatId, title);
+        },
+        [activeChat?._id, handleRename]
+      );
 
       return (
         <div
           data-tauri-drag-region
-          className={`h-full flex flex-col rounded-xl overflow-hidden`}
+          className={`flex flex-col rounded-md relative h-full overflow-hidden`}
         >
-          {!setIsSidebarOpen && (
+          {showChatHistory && !setIsSidebarOpen && (
             <ChatSidebar
               isSidebarOpen={isSidebarOpenChat}
               chats={chats}
               activeChat={activeChat}
-              onNewChat={clearChat}
+              // onNewChat={clearChat}
               onSelectChat={onSelectChat}
               onDeleteChat={deleteChat}
-              fetchChatHistory={fetchChatHistory}
+              fetchChatHistory={getChatHistory}
+              onSearch={handleSearch}
+              onRename={renameChat}
             />
           )}
 
@@ -319,13 +346,18 @@ const ChatAI = memo(
             activeChat={activeChat}
             reconnect={reconnect}
             isChatPage={isChatPage}
-            setIsLogin={setIsLoginChat}
+            isLogin={isLogin}
+            setIsLogin={setIsLogin}
+            showChatHistory={showChatHistory}
+            assistantIDs={assistantIDs}
           />
+
           {isLogin ? (
             <ChatContent
               activeChat={activeChat}
               curChatEnd={curChatEnd}
               query_intent={query_intent}
+              tools={tools}
               fetch_source={fetch_source}
               pick_source={pick_source}
               deep_read={deep_read}
@@ -333,14 +365,19 @@ const ChatAI = memo(
               response={response}
               loadingStep={loadingStep}
               timedoutShow={timedoutShow}
-              errorShow={errorShow}
               Question={Question}
-              handleSendMessage={(value) => handleSendMessage(value, activeChat)}
+              handleSendMessage={(value) =>
+                handleSendMessage(value, activeChat)
+              }
               getFileUrl={getFileUrl}
             />
           ) : (
             <ConnectPrompt />
           )}
+
+          {!activeChat?._id && !visibleStartPage && (
+            <PrevSuggestion sendMessage={init} />
+          )}
         </div>
       );
     }

src/components/Assistant/ChatContent.tsx

@@ -1,4 +1,4 @@
-import { useRef, useEffect } from "react";
+import { useRef, useEffect, UIEvent, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import { ChatMessage } from "@/components/ChatMessage";
@@ -7,13 +7,18 @@ import FileList from "@/components/Assistant/FileList";
 import { useChatScroll } from "@/hooks/useChatScroll";
 import { useChatStore } from "@/stores/chatStore";
 import type { Chat, IChunkData } from "./types";
-import SessionFile from "./SessionFile";
+// import SessionFile from "./SessionFile";
 import { useConnectStore } from "@/stores/connectStore";
+import SessionFile from "./SessionFile";
+import Splash from "./Splash";
+import { ArrowDown } from "lucide-react";
+import clsx from "clsx";
 
 interface ChatContentProps {
   activeChat?: Chat;
   curChatEnd: boolean;
   query_intent?: IChunkData;
+  tools?: IChunkData;
   fetch_source?: IChunkData;
   pick_source?: IChunkData;
   deep_read?: IChunkData;
@@ -21,7 +26,6 @@ interface ChatContentProps {
   response?: IChunkData;
   loadingStep?: Record<string, boolean>;
   timedoutShow: boolean;
-  errorShow: boolean;
   Question: string;
   handleSendMessage: (content: string, newChat?: Chat) => void;
   getFileUrl: (path: string) => string;
@@ -31,6 +35,7 @@ export const ChatContent = ({
   activeChat,
   curChatEnd,
   query_intent,
+  tools,
   fetch_source,
   pick_source,
   deep_read,
@@ -38,7 +43,6 @@ export const ChatContent = ({
   response,
   loadingStep,
   timedoutShow,
-  errorShow,
   Question,
   handleSendMessage,
   getFileUrl,
@@ -50,15 +54,16 @@ export const ChatContent = ({
 
   useEffect(() => {
     setCurrentSessionId(activeChat?._id);
-  }, [activeChat]);
+  }, [activeChat?._id]);
 
   const { t } = useTranslation();
 
   const uploadFiles = useChatStore((state) => state.uploadFiles);
-
   const messagesEndRef = useRef<HTMLDivElement>(null);
 
   const { scrollToBottom } = useChatScroll(messagesEndRef);
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const [isAtBottom, setIsAtBottom] = useState(true);
 
   useEffect(() => {
     scrollToBottom();
@@ -79,10 +84,25 @@ export const ChatContent = ({
     };
   }, [scrollToBottom]);
 
+  const allMessages = activeChat?.messages || [];
+
+  const handleScroll = (event: UIEvent<HTMLDivElement>) => {
+    const { scrollHeight, scrollTop, clientHeight } =
+      event.currentTarget as HTMLDivElement;
+
+    const isAtBottom = scrollHeight - scrollTop - clientHeight < 50;
+
+    setIsAtBottom(isAtBottom);
+  };
+
   return (
-    <div className="relative flex flex-col h-full justify-between overflow-hidden">
-      <div className="flex-1 w-full overflow-x-hidden overflow-y-auto border-t border-[rgba(0,0,0,0.1)] dark:border-[rgba(255,255,255,0.15)] custom-scrollbar relative">
-        <Greetings />
+    <div className="flex-1 overflow-hidden flex flex-col justify-between relative">
+      <div
+        ref={scrollRef}
+        className="flex-1 w-full overflow-x-hidden overflow-y-auto border-t border-[rgba(0,0,0,0.1)] dark:border-[rgba(255,255,255,0.15)] custom-scrollbar relative"
+        onScroll={handleScroll}
+      >
+        {(!activeChat || activeChat?.messages?.length === 0) && <Greetings />}
 
         {activeChat?.messages?.map((message, index) => (
           <ChatMessage
@@ -92,8 +112,10 @@ export const ChatContent = ({
             onResend={handleSendMessage}
           />
         ))}
+
         {(!curChatEnd ||
           query_intent ||
+          tools ||
           fetch_source ||
           pick_source ||
           deep_read ||
@@ -106,6 +128,8 @@ export const ChatContent = ({
               _id: "current",
               _source: {
                 type: "assistant",
+                assistant_id:
+                  allMessages[allMessages.length - 1]?._source?.assistant_id,
                 message: "",
                 question: Question,
               },
@@ -113,6 +137,7 @@ export const ChatContent = ({
             onResend={handleSendMessage}
             isTyping={!curChatEnd}
             query_intent={query_intent}
+            tools={tools}
             fetch_source={fetch_source}
             pick_source={pick_source}
             deep_read={deep_read}
@@ -121,6 +146,7 @@ export const ChatContent = ({
             loadingStep={loadingStep}
           />
         ) : null}
+
         {timedoutShow ? (
           <ChatMessage
             key={"timedout"}
@@ -136,21 +162,6 @@ export const ChatContent = ({
             isTyping={false}
           />
         ) : null}
-        {errorShow ? (
-          <ChatMessage
-            key={"error"}
-            message={{
-              _id: "error",
-              _source: {
-                type: "assistant",
-                message: t("assistant.chat.error"),
-                question: Question,
-              },
-            }}
-            onResend={handleSendMessage}
-            isTyping={false}
-          />
-        ) : null}
         <div ref={messagesEndRef} />
       </div>
 
@@ -161,6 +172,25 @@ export const ChatContent = ({
       )}
 
       {sessionId && <SessionFile sessionId={sessionId} />}
+
+      <Splash />
+
+      <button
+        className={clsx(
+          "absolute right-4 bottom-4 flex items-center justify-center size-8 border bg-white rounded-full shadow dark:border-[#272828] dark:bg-black dark:shadow-white/15",
+          {
+            hidden: isAtBottom,
+          }
+        )}
+        onClick={() => {
+          scrollRef.current?.scrollTo({
+            top: scrollRef.current?.scrollHeight,
+            behavior: "smooth",
+          });
+        }}
+      >
+        <ArrowDown className="size-5" />
+      </button>
     </div>
   );
 };

src/components/Assistant/ChatHeader.tsx

@@ -1,34 +1,19 @@
-import {
-  MessageSquarePlus,
-  ChevronDownIcon,
-  Settings,
-  RefreshCw,
-  Check,
-  Server,
-} from "lucide-react";
-import { useState, useEffect, useCallback } from "react";
-import {
-  Menu,
-  MenuButton,
-  MenuItem,
-  MenuItems,
-  Popover,
-  PopoverButton,
-  PopoverPanel,
-} from "@headlessui/react";
-import { useTranslation } from "react-i18next";
+import { MessageSquarePlus } from "lucide-react";
+import clsx from "clsx";
 
-import logoImg from "@/assets/icon.svg";
 import HistoryIcon from "@/icons/History";
 import PinOffIcon from "@/icons/PinOff";
 import PinIcon from "@/icons/Pin";
-import ServerIcon from "@/icons/Server";
 import WindowsFullIcon from "@/icons/WindowsFull";
 import { useAppStore, IServer } from "@/stores/appStore";
-import { useChatStore } from "@/stores/chatStore";
 import type { Chat } from "./types";
-import { useConnectStore } from "@/stores/connectStore";
 import platformAdapter from "@/utils/platformAdapter";
+import VisibleKey from "../Common/VisibleKey";
+import { useShortcutsStore } from "@/stores/shortcutsStore";
+import { HISTORY_PANEL_ID } from "@/constants";
+import { AssistantList } from "./AssistantList";
+import { ServerList } from "./ServerList";
+
 interface ChatHeaderProps {
   onCreateNewChat: () => void;
   onOpenChatAI: () => void;
@@ -36,97 +21,41 @@ interface ChatHeaderProps {
   isSidebarOpen: boolean;
   activeChat: Chat | undefined;
   reconnect: (server?: IServer) => void;
+  isLogin: boolean;
   setIsLogin: (isLogin: boolean) => void;
   isChatPage?: boolean;
+  showChatHistory?: boolean;
+  assistantIDs?: string[];
 }
 
 export function ChatHeader({
   onCreateNewChat,
   onOpenChatAI,
+  isSidebarOpen,
   setIsSidebarOpen,
   activeChat,
   reconnect,
+  isLogin,
   setIsLogin,
   isChatPage = false,
+  showChatHistory = true,
+  assistantIDs,
 }: ChatHeaderProps) {
-  const { t } = useTranslation();
-
-  const setEndpoint = useAppStore((state) => state.setEndpoint);
   const isPinned = useAppStore((state) => state.isPinned);
   const setIsPinned = useAppStore((state) => state.setIsPinned);
 
-  const { setMessages } = useChatStore();
+  const isTauri = useAppStore((state) => state.isTauri);
+  const historicalRecords = useShortcutsStore((state) => {
+    return state.historicalRecords;
+  });
+  const newSession = useShortcutsStore((state) => {
+    return state.newSession;
+  });
+  const fixedWindow = useShortcutsStore((state) => {
+    return state.fixedWindow;
+  });
 
-  const [serverList, setServerList] = useState<IServer[]>([]);
-  const [isRefreshing, setIsRefreshing] = useState(false);
-
-  const currentService = useConnectStore((state) => state.currentService);
-  const setCurrentService = useConnectStore((state) => state.setCurrentService);
-
-  const fetchServers = useCallback(async (resetSelection: boolean) => {
-    platformAdapter.invokeBackend("list_coco_servers")
-      .then((res: any) => {
-        const enabledServers = (res as IServer[]).filter(
-          (server) => server.enabled !== false
-        );
-        //console.log("list_coco_servers", enabledServers);
-        setServerList(enabledServers);
-
-        if (resetSelection && enabledServers.length > 0) {
-          const currentServiceExists = enabledServers.find(
-            (server) => server.id === currentService?.id
-          );
-
-          if (currentServiceExists) {
-            switchServer(currentServiceExists);
-          } else {
-            switchServer(enabledServers[enabledServers.length - 1]);
-          }
-        }
-      })
-      .catch((err: any) => {
-        console.error(err);
-      });
-  }, [currentService?.id]);
-
-  useEffect(() => {
-    fetchServers(true);
-
-    const unlisten = platformAdapter.listenEvent("login_or_logout", (event) => {
-      console.log("Login or Logout:", currentService, event);
-      fetchServers(true);
-    });
-
-    return () => {
-      // Cleanup logic if needed
-      unlisten.then((fn) => fn());
-    };
-  }, []);
-
-  
-
-  const switchServer = async (server: IServer) => {
-    if (!server) return;
-    try {
-      // Switch UI first, then switch server connection
-      setCurrentService(server);
-      setEndpoint(server.endpoint);
-      setMessages(""); // Clear previous messages
-      onCreateNewChat();
-      //
-      if (!server.public && !server.profile) {
-        setIsLogin(false);
-        return;
-      }
-      setIsLogin(true);
-      // The Rust backend will automatically disconnect, 
-      // so we don't need to handle disconnection on the frontend
-      // src-tauri/src/server/websocket.rs
-      reconnect && reconnect(server);
-    } catch (error) {
-      console.error("switchServer:", error);
-    }
-  };
+  const external = useShortcutsStore((state) => state.external);
 
   const togglePin = async () => {
     try {
@@ -139,183 +68,81 @@ export function ChatHeader({
     }
   };
 
-  const openSettings = async () => {
-    platformAdapter.emitEvent("open_settings", "connect");
-  };
-
   return (
     <header
-      className="flex items-center justify-between py-2 px-3"
+      className="flex items-center justify-between py-2 px-3 select-none"
       data-tauri-drag-region
     >
       <div className="flex items-center gap-2">
-        <button
-          data-sidebar-button
-          onClick={(e) => {
-            e.stopPropagation();
-            setIsSidebarOpen();
-          }}
-          className="p-2 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800"
-        >
-          <HistoryIcon />
-        </button>
-
-        <Menu>
-          <MenuButton className="flex items-center gap-1 rounded-full bg-white dark:bg-[#202126] p-1 text-sm/6 font-semibold text-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-none">
-            <img
-              src={logoImg}
-              className="w-4 h-4"
-              alt={t("assistant.message.logo")}
-            />
-            Coco AI
-            <ChevronDownIcon className="size-4 text-gray-500 dark:text-gray-400" />
-          </MenuButton>
-
-          <MenuItems
-            transition
-            anchor="bottom end"
-            className="w-28 origin-top-right rounded-xl bg-white dark:bg-[#202126] p-1 text-sm/6 text-gray-800 dark:text-white shadow-lg border border-gray-200 dark:border-gray-700 focus:outline-none data-[closed]:scale-95 data-[closed]:opacity-0"
+        {showChatHistory && (
+          <button
+            data-sidebar-button
+            onClick={(e) => {
+              e.stopPropagation();
+              setIsSidebarOpen();
+            }}
+            aria-controls={isSidebarOpen ? HISTORY_PANEL_ID : void 0}
+            className="py-1 px-2 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800"
           >
-            <MenuItem>
-              <button className="group flex w-full items-center gap-2 rounded-lg py-1.5 px-3 hover:bg-gray-100 dark:hover:bg-gray-700">
-                <img
-                  src={logoImg}
-                  className="w-4 h-4"
-                  alt={t("assistant.message.logo")}
-                />
-                Coco AI
-              </button>
-            </MenuItem>
-          </MenuItems>
-        </Menu>
-
-        <button
-          onClick={onCreateNewChat}
-          className="p-2 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800"
-        >
-          <MessageSquarePlus className="h-4 w-4" />
-        </button>
-      </div>
-
-      <div>
-        <h2 className="text-sm font-medium text-gray-900 dark:text-gray-100 truncate">
-          {activeChat?._source?.title ||
-            activeChat?._source?.message ||
-            activeChat?._id}
-        </h2>
-      </div>
-
-      <div className="flex items-center gap-2">
-        <button
-          onClick={togglePin}
-          className={`${isPinned ? "text-blue-500" : ""}`}
-        >
-          {isPinned ? <PinIcon /> : <PinOffIcon />}
-        </button>
-
-        <Popover className="relative">
-          <PopoverButton className="flex items-center">
-            <ServerIcon />
-          </PopoverButton>
-
-          <PopoverPanel className="absolute right-0 z-10 mt-2 min-w-[240px] bg-white dark:bg-[#202126] rounded-lg shadow-lg border border-gray-200 dark:border-gray-700">
-            <div className="p-3">
-              <div className="flex items-center justify-between mb-3 whitespace-nowrap">
-                <h3 className="text-sm font-medium text-gray-900 dark:text-gray-100">
-                  Servers
-                </h3>
-                <div className="flex items-center gap-2">
-                  <button
-                    onClick={openSettings}
-                    className="p-1 rounded-md hover:bg-gray-100 dark:hover:bg-gray-800 text-gray-500 dark:text-gray-400"
-                  >
-                    <Settings className="h-4 w-4 text-[#0287FF]" />
-                  </button>
-                  <button
-                    onClick={async () => {
-                      setIsRefreshing(true);
-                      await fetchServers(false);
-                      setTimeout(() => setIsRefreshing(false), 1000);
-                    }}
-                    className="p-1 rounded-md hover:bg-gray-100 dark:hover:bg-gray-800 text-gray-500 dark:text-gray-400"
-                    disabled={isRefreshing}
-                  >
-                    <RefreshCw
-                      className={`h-4 w-4 text-[#0287FF] transition-transform duration-1000 ${
-                        isRefreshing ? "animate-spin" : ""
-                      }`}
-                    />
-                  </button>
-                </div>
-              </div>
-              <div className="space-y-1">
-                {serverList.length > 0 ? (
-                  serverList.map((server) => (
-                    <div
-                      key={server.id}
-                      onClick={() => switchServer(server)}
-                      className={`w-full flex items-center justify-between gap-1 p-2 rounded-lg transition-colors whitespace-nowrap ${
-                        currentService?.id === server.id
-                          ? "bg-gray-100 dark:bg-gray-800"
-                          : "hover:bg-gray-50 dark:hover:bg-gray-800/50"
-                      }`}
-                    >
-                      <div className="flex items-center gap-2 overflow-hidden min-w-0">
-                        <img
-                          src={server?.provider?.icon || logoImg}
-                          alt={server.name}
-                          className="w-6 h-6 rounded-full bg-gray-100 dark:bg-gray-800"
-                        />
-                        <div className="text-left flex-1 min-w-0">
-                          <div className="text-sm font-medium text-gray-900 dark:text-gray-100 truncate max-w-[200px]">
-                            {server.name}
-                          </div>
-                          <div className="text-xs text-gray-500 dark:text-gray-400 truncate max-w-[200px]">
-                            AI Assistant: {server.assistantCount || 1}
-                          </div>
-                        </div>
-                      </div>
-                      <div className="flex items-center gap-2">
-                        <span
-                          className={`w-3 h-3 rounded-full ${
-                            server.health?.status
-                              ? `bg-[${server.health?.status}]`
-                              : "bg-gray-400 dark:bg-gray-600"
-                          }`}
-                        />
-                        <div className="w-4 h-4">
-                          {currentService?.id === server.id && (
-                            <Check className="w-full h-full text-gray-500 dark:text-gray-400" />
-                          )}
-                        </div>
-                      </div>
-                    </div>
-                  ))
-                ) : (
-                  <div className="flex flex-col items-center justify-center py-6 text-center">
-                    <Server className="w-8 h-8 text-gray-400 dark:text-gray-600 mb-2" />
-                    <p className="text-sm text-gray-500 dark:text-gray-400">
-                      {t("assistant.chat.noServers")}
-                    </p>
-                    <button
-                      onClick={openSettings}
-                      className="mt-2 text-xs text-[#0287FF] hover:underline"
-                    >
-                      {t("assistant.chat.addServer")}
-                    </button>
-                  </div>
-                )}
-              </div>
-            </div>
-          </PopoverPanel>
-        </Popover>
-
-        {isChatPage ? null : (
-          <button onClick={onOpenChatAI}>
-            <WindowsFullIcon className="rotate-30 scale-x-[-1]" />
+            <VisibleKey
+              shortcut={historicalRecords}
+              onKeyPress={setIsSidebarOpen}
+            >
+              <HistoryIcon className="h-4 w-4" />
+            </VisibleKey>
           </button>
         )}
+
+        <AssistantList assistantIDs={assistantIDs} />
+
+        {showChatHistory ? (
+          <button
+            onClick={onCreateNewChat}
+            className="p-2 py-1 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-800"
+          >
+            <VisibleKey shortcut={newSession} onKeyPress={onCreateNewChat}>
+              <MessageSquarePlus className="h-4 w-4 relative top-0.5" />
+            </VisibleKey>
+          </button>
+        ) : null}
       </div>
+
+      <h2 className="max-w-[calc(100%-200px)] text-sm font-medium text-gray-900 dark:text-gray-100 truncate">
+        {activeChat?._source?.title ||
+          activeChat?._source?.message ||
+          activeChat?._id}
+      </h2>
+      {isTauri ? (
+        <div className="flex items-center gap-2">
+          <button
+            onClick={togglePin}
+            className={clsx("inline-flex", {
+              "text-blue-500": isPinned,
+            })}
+          >
+            <VisibleKey shortcut={fixedWindow} onKeyPress={togglePin}>
+              {isPinned ? <PinIcon /> : <PinOffIcon />}
+            </VisibleKey>
+          </button>
+
+          <ServerList
+            isLogin={isLogin}
+            setIsLogin={setIsLogin}
+            reconnect={reconnect}
+            onCreateNewChat={onCreateNewChat}
+          />
+
+          {isChatPage ? null : (
+            <button className="inline-flex" onClick={onOpenChatAI}>
+              <VisibleKey shortcut={external} onKeyPress={onOpenChatAI}>
+                <WindowsFullIcon className="rotate-30 scale-x-[-1]" />
+              </VisibleKey>
+            </button>
+          )}
+        </div>
+      ) : (
+        <div />
+      )}
     </header>
   );
 }

src/components/Assistant/ChatSidebar.tsx

@@ -1,44 +1,65 @@
 import React from "react";
 
-import { Sidebar } from "@/components/Assistant/Sidebar";
+// import { Sidebar } from "@/components/Assistant/Sidebar";
 import type { Chat } from "./types";
+import HistoryList from "../Common/HistoryList";
+import { HISTORY_PANEL_ID } from "@/constants";
 
 interface ChatSidebarProps {
   isSidebarOpen: boolean;
   chats: Chat[];
   activeChat?: Chat;
-  onNewChat: () => void;
+  // onNewChat: () => void;
   onSelectChat: (chat: any) => void;
   onDeleteChat: (chatId: string) => void;
   fetchChatHistory: () => void;
+  onSearch: (keyword: string) => void;
+  onRename: (chat: any, title: string) => void;
 }
 
 export const ChatSidebar: React.FC<ChatSidebarProps> = ({
   isSidebarOpen,
   chats,
   activeChat,
-  onNewChat,
+  // onNewChat,
   onSelectChat,
   onDeleteChat,
   fetchChatHistory,
+  onSearch,
+  onRename,
 }) => {
   return (
     <div
       data-sidebar
-      className={`fixed inset-y-0 left-0 z-50 w-64 transform transition-all duration-300 ease-in-out 
-      ${isSidebarOpen ? "translate-x-0" : "-translate-x-[calc(100%)]"}
-      md:relative md:translate-x-0 bg-gray-100 dark:bg-gray-800
-      border-r border-gray-200 dark:border-gray-700 rounded-tl-xl rounded-bl-xl
-      overflow-hidden`}
+      className={`
+        h-screen fixed top-0 left-0 z-100 w-64 
+        transform transition-all duration-300 ease-in-out 
+        ${isSidebarOpen ? "translate-x-0" : "-translate-x-full"}
+        bg-gray-100 dark:bg-gray-800
+        border-r border-gray-200 dark:border-gray-700 rounded-tl-xl rounded-bl-xl
+        overflow-hidden
+      `}
     >
-      <Sidebar
+      {isSidebarOpen && (
+        <HistoryList
+          id={HISTORY_PANEL_ID}
+          list={chats}
+          active={activeChat}
+          onSearch={onSearch}
+          onRefresh={fetchChatHistory}
+          onSelect={onSelectChat}
+          onRename={onRename}
+          onRemove={onDeleteChat}
+        />
+      )}
+      {/* <Sidebar
         chats={chats}
         activeChat={activeChat}
         onNewChat={onNewChat}
         onSelectChat={onSelectChat}
         onDeleteChat={onDeleteChat}
         fetchChatHistory={fetchChatHistory}
-      />
+      /> */}
     </div>
   );
-};
+};

src/components/Assistant/FileList.tsx

@@ -4,10 +4,11 @@ import { X } from "lucide-react";
 import { useAsyncEffect } from "ahooks";
 import { useTranslation } from "react-i18next";
 
-import { useChatStore } from "@/stores/chatStore";
+import { UploadFile, useChatStore } from "@/stores/chatStore";
 import { useConnectStore } from "@/stores/connectStore";
-import { deleteAttachment, uploadAttachment } from "@/api/attachment";
 import FileIcon from "../Common/Icons/FileIcon";
+import platformAdapter from "@/utils/platformAdapter";
+import Tooltip2 from "../Common/Tooltip2";
 
 interface FileListProps {
   sessionId: string;
@@ -39,42 +40,70 @@ const FileList = (props: FileListProps) => {
 
       if (uploaded) continue;
 
-      const attachmentIds = await uploadAttachment({
-        serverId,
-        sessionId,
-        filePaths: [path],
-      });
+      try {
+        const attachmentIds: any = await platformAdapter.commands(
+          "upload_attachment",
+          {
+            serverId,
+            sessionId,
+            filePaths: [path],
+          }
+        );
 
-      if (!attachmentIds) continue;
+        if (!attachmentIds) {
+          throw new Error("Failed to get attachment id");
+        } else {
+          Object.assign(item, {
+            uploaded: true,
+            attachmentId: attachmentIds[0],
+          });
+        }
 
-      Object.assign(item, {
-        uploaded: true,
-        attachmentId: attachmentIds[0],
-      });
-
-      setUploadFiles(uploadFiles);
+        setUploadFiles(uploadFiles);
+      } catch (error) {
+        Object.assign(item, {
+          uploadFailed: true,
+          failedMessage: String(error),
+        });
+      }
     }
   }, [uploadFiles]);
 
-  const deleteFile = async (id: string, attachmentId: string) => {
+  const deleteFile = async (file: UploadFile) => {
+    const { id, uploadFailed, attachmentId } = file;
+
     setUploadFiles(uploadFiles.filter((file) => file.id !== id));
 
-    deleteAttachment({ serverId, id: attachmentId });
+    if (uploadFailed) return;
+
+    platformAdapter.commands("delete_attachment", {
+      serverId,
+      id: attachmentId,
+    });
   };
 
   return (
     <div className="flex flex-wrap gap-y-2 -mx-1 text-sm">
       {uploadFiles.map((file) => {
-        const { id, name, extname, size, uploaded, attachmentId } = file;
+        const {
+          id,
+          name,
+          extname,
+          size,
+          uploaded,
+          attachmentId,
+          uploadFailed,
+          failedMessage,
+        } = file;
 
         return (
           <div key={id} className="w-1/3 px-1">
             <div className="relative group flex items-center gap-1 p-1 rounded-[4px] bg-[#dedede] dark:bg-[#202126]">
-              {attachmentId && (
+              {(uploadFailed || attachmentId) && (
                 <div
                   className="absolute flex justify-center items-center size-[14px] bg-red-600 top-0 right-0 rounded-full cursor-pointer translate-x-[5px] -translate-y-[5px] transition opacity-0 group-hover:opacity-100 "
                   onClick={() => {
-                    deleteFile(id, attachmentId);
+                    deleteFile(file);
                   }}
                 >
                   <X className="size-[10px] text-white" />
@@ -88,16 +117,24 @@ const FileList = (props: FileListProps) => {
                   {name}
                 </div>
 
-                <div className="text-xs text-[#999999]">
-                  {uploaded ? (
-                    <div className="flex gap-2">
-                      {extname && <span>{extname}</span>}
-                      <span>
-                        {filesize(size, { standard: "jedec", spacer: "" })}
-                      </span>
-                    </div>
+                <div className="text-xs">
+                  {uploadFailed && failedMessage ? (
+                    <Tooltip2 content={failedMessage}>
+                      <span className="text-red-500">Upload Failed</span>
+                    </Tooltip2>
                   ) : (
-                    <span>{t("assistant.fileList.uploading")}</span>
+                    <div className="text-[#999]">
+                      {uploaded ? (
+                        <div className="flex gap-2">
+                          {extname && <span>{extname}</span>}
+                          <span>
+                            {filesize(size, { standard: "jedec", spacer: "" })}
+                          </span>
+                        </div>
+                      ) : (
+                        <span>{t("assistant.fileList.uploading")}</span>
+                      )}
+                    </div>
                   )}
                 </div>
               </div>

src/components/Assistant/Greetings.tsx

@@ -1,9 +1,11 @@
 import { useTranslation } from "react-i18next";
 
 import { ChatMessage } from "@/components/ChatMessage";
+import { useConnectStore } from "@/stores/connectStore";
 
 export const Greetings = () => {
   const { t } = useTranslation();
+  const currentAssistant = useConnectStore((state) => state.currentAssistant);
 
   return (
     <ChatMessage
@@ -12,7 +14,9 @@ export const Greetings = () => {
         _id: "greetings",
         _source: {
           type: "assistant",
-          message: t("assistant.chat.greetings"),
+          message:
+            currentAssistant?._source?.chat_settings?.greeting_message ||
+            t("assistant.chat.greetings"),
         },
       }}
     />

src/components/Assistant/ServerList.tsx

@@ -0,0 +1,258 @@
+import { useState, useCallback, useEffect, useRef } from "react";
+import { Settings, RefreshCw, Check, Server } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import { Popover, PopoverButton, PopoverPanel } from "@headlessui/react";
+import { useKeyPress } from "ahooks";
+
+import logoImg from "@/assets/icon.svg";
+import ServerIcon from "@/icons/Server";
+import VisibleKey from "../Common/VisibleKey";
+import { useShortcutsStore } from "@/stores/shortcutsStore";
+import platformAdapter from "@/utils/platformAdapter";
+import { useAppStore, IServer } from "@/stores/appStore";
+import { useChatStore } from "@/stores/chatStore";
+import { useConnectStore } from "@/stores/connectStore";
+import { isNil } from "lodash-es";
+
+interface ServerListProps {
+  isLogin: boolean;
+  setIsLogin: (isLogin: boolean) => void;
+  reconnect: (server?: IServer) => void;
+  onCreateNewChat: () => void;
+}
+
+export function ServerList({
+  isLogin,
+  setIsLogin,
+  reconnect,
+  onCreateNewChat,
+}: ServerListProps) {
+  const { t } = useTranslation();
+
+  const serviceList = useShortcutsStore((state) => state.serviceList);
+  const setEndpoint = useAppStore((state) => state.setEndpoint);
+  const setCurrentService = useConnectStore((state) => state.setCurrentService);
+  const isTauri = useAppStore((state) => state.isTauri);
+  const currentService = useConnectStore((state) => state.currentService);
+
+  const { setMessages } = useChatStore();
+
+  const [serverList, setServerList] = useState<IServer[]>([]);
+  const [isRefreshing, setIsRefreshing] = useState(false);
+
+  const serverListButtonRef = useRef<HTMLButtonElement>(null);
+
+  const fetchServers = useCallback(
+    async (resetSelection: boolean) => {
+      platformAdapter
+        .commands("list_coco_servers")
+        .then((res: any) => {
+          const enabledServers = (res as IServer[]).filter(
+            (server) => server.enabled !== false
+          );
+          //console.log("list_coco_servers", enabledServers);
+          setServerList(enabledServers);
+
+          if (resetSelection && enabledServers.length > 0) {
+            const currentServiceExists = enabledServers.find(
+              (server) => server.id === currentService?.id
+            );
+
+            if (currentServiceExists) {
+              switchServer(currentServiceExists);
+            } else {
+              switchServer(enabledServers[enabledServers.length - 1]);
+            }
+          }
+        })
+        .catch((err: any) => {
+          console.error(err);
+        });
+    },
+    [currentService?.id]
+  );
+
+  useEffect(() => {
+    if (!isTauri) return;
+
+    fetchServers(true);
+
+    const unlisten = platformAdapter.listenEvent("login_or_logout", (event) => {
+      //console.log("Login or Logout:", currentService, event.payload);
+      if (event.payload !== isLogin) {
+        setIsLogin(!!event.payload);
+      }
+      fetchServers(true);
+    });
+
+    return () => {
+      // Cleanup logic if needed
+      unlisten.then((fn) => fn());
+    };
+  }, []);
+
+  const handleRefresh = async () => {
+    setIsRefreshing(true);
+    await fetchServers(false);
+    setTimeout(() => setIsRefreshing(false), 1000);
+  };
+
+  const openSettings = async () => {
+    platformAdapter.emitEvent("open_settings", "connect");
+  };
+
+  const switchServer = async (server: IServer) => {
+    if (!server) return;
+    try {
+      // Switch UI first, then switch server connection
+      setCurrentService(server);
+      setEndpoint(server.endpoint);
+      setMessages(""); // Clear previous messages
+      onCreateNewChat();
+      //
+      if (!server.public && !server.profile) {
+        setIsLogin(false);
+        return;
+      }
+      setIsLogin(true);
+      // The Rust backend will automatically disconnect,
+      // so we don't need to handle disconnection on the frontend
+      // src-tauri/src/server/websocket.rs
+      reconnect && reconnect(server);
+    } catch (error) {
+      console.error("switchServer:", error);
+    }
+  };
+
+  useKeyPress(["uparrow", "downarrow"], (_, key) => {
+    const isClose = isNil(serverListButtonRef.current?.dataset["open"]);
+    const length = serverList.length;
+
+    if (isClose || length <= 1) return;
+
+    const currentIndex = serverList.findIndex((server) => {
+      return server.id === currentService?.id;
+    });
+
+    let nextIndex = currentIndex;
+
+    if (key === "uparrow") {
+      nextIndex = currentIndex > 0 ? currentIndex - 1 : length - 1;
+    } else if (key === "downarrow") {
+      nextIndex = currentIndex < serverList.length - 1 ? currentIndex + 1 : 0;
+    }
+
+    switchServer(serverList[nextIndex]);
+  });
+
+  return (
+    <Popover className="relative">
+      <PopoverButton ref={serverListButtonRef} className="flex items-center">
+        <VisibleKey
+          shortcut={serviceList}
+          onKeyPress={() => {
+            serverListButtonRef.current?.click();
+          }}
+        >
+          <ServerIcon />
+        </VisibleKey>
+      </PopoverButton>
+
+      <PopoverPanel className="absolute right-0 z-10 mt-2 min-w-[240px] bg-white dark:bg-[#202126] rounded-lg shadow-lg border border-gray-200 dark:border-gray-700">
+        <div className="p-3">
+          <div className="flex items-center justify-between mb-3 whitespace-nowrap">
+            <h3 className="text-sm font-medium text-gray-900 dark:text-gray-100">
+              Servers
+            </h3>
+            <div className="flex items-center gap-2">
+              <button
+                onClick={openSettings}
+                className="p-1 rounded-md hover:bg-gray-100 dark:hover:bg-gray-800 text-gray-500 dark:text-gray-400"
+              >
+                <VisibleKey shortcut=",">
+                  <Settings className="h-4 w-4 text-[#0287FF]" />
+                </VisibleKey>
+              </button>
+              <button
+                onClick={handleRefresh}
+                className="p-1 rounded-md hover:bg-gray-100 dark:hover:bg-gray-800 text-gray-500 dark:text-gray-400"
+                disabled={isRefreshing}
+              >
+                <VisibleKey shortcut="R" onKeyPress={handleRefresh}>
+                  <RefreshCw
+                    className={`h-4 w-4 text-[#0287FF] transition-transform duration-1000 ${
+                      isRefreshing ? "animate-spin" : ""
+                    }`}
+                  />
+                </VisibleKey>
+              </button>
+            </div>
+          </div>
+          <div className="space-y-1">
+            {serverList.length > 0 ? (
+              serverList.map((server) => (
+                <div
+                  key={server.id}
+                  onClick={() => switchServer(server)}
+                  className={`w-full flex items-center justify-between gap-1 p-2 rounded-lg transition-colors whitespace-nowrap ${
+                    currentService?.id === server.id
+                      ? "bg-gray-100 dark:bg-gray-800"
+                      : "hover:bg-gray-50 dark:hover:bg-gray-800/50"
+                  }`}
+                >
+                  <div className="flex items-center gap-2 overflow-hidden min-w-0">
+                    <img
+                      src={server?.provider?.icon || logoImg}
+                      alt={server.name}
+                      className="w-6 h-6 rounded-full bg-gray-100 dark:bg-gray-800"
+                    />
+                    <div className="text-left flex-1 min-w-0">
+                      <div className="text-sm font-medium text-gray-900 dark:text-gray-100 truncate max-w-[200px]">
+                        {server.name}
+                      </div>
+                      <div className="text-xs text-gray-500 dark:text-gray-400 truncate max-w-[200px]">
+                        AI Assistant: {server.assistantCount || 1}
+                      </div>
+                    </div>
+                  </div>
+                  <div className="flex flex-col items-center gap-2">
+                    <span
+                      className={`w-3 h-3 rounded-full ${
+                        server.health?.status
+                          ? `bg-[${server.health?.status}]`
+                          : "bg-gray-400 dark:bg-gray-600"
+                      }`}
+                    />
+                    <div className="size-4 flex justify-end">
+                      {currentService?.id === server.id && (
+                        <VisibleKey
+                          shortcut="↓↑"
+                          shortcutClassName="w-6 -translate-x-4"
+                        >
+                          <Check className="w-full h-full text-gray-500 dark:text-gray-400" />
+                        </VisibleKey>
+                      )}
+                    </div>
+                  </div>
+                </div>
+              ))
+            ) : (
+              <div className="flex flex-col items-center justify-center py-6 text-center">
+                <Server className="w-8 h-8 text-gray-400 dark:text-gray-600 mb-2" />
+                <p className="text-sm text-gray-500 dark:text-gray-400">
+                  {t("assistant.chat.noServers")}
+                </p>
+                <button
+                  onClick={openSettings}
+                  className="mt-2 text-xs text-[#0287FF] hover:underline"
+                >
+                  {t("assistant.chat.addServer")}
+                </button>
+              </div>
+            )}
+          </div>
+        </div>
+      </PopoverPanel>
+    </Popover>
+  );
+}

src/components/Assistant/SessionFile.tsx

@@ -1,160 +1,174 @@
-import {
-  AttachmentHit,
-  deleteAttachment,
-  getAttachment,
-} from "@/api/attachment";
-import { useConnectStore } from "@/stores/connectStore";
 import clsx from "clsx";
-import { filesize } from "filesize";
-import { Files, Trash2, X } from "lucide-react";
-import { useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import Checkbox from "../Common/Checkbox";
-import FileIcon from "../Common/Icons/FileIcon";
+import {filesize} from "filesize";
+import {Files, Trash2, X} from "lucide-react";
+import {useEffect, useMemo, useState} from "react";
+import {useTranslation} from "react-i18next";
+
+import {useConnectStore} from "@/stores/connectStore";
+import Checkbox from "@/components/Common/Checkbox";
+import FileIcon from "@/components/Common/Icons/FileIcon";
+import {AttachmentHit} from "@/types/commands";
+import {useAppStore} from "@/stores/appStore";
+import platformAdapter from "@/utils/platformAdapter";
 
 interface SessionFileProps {
-  sessionId: string;
+    sessionId: string;
 }
 
 const SessionFile = (props: SessionFileProps) => {
-  const { sessionId } = props;
-  const { t } = useTranslation();
-  const currentService = useConnectStore((state) => state.currentService);
-  const [uploadedFiles, setUploadedFiles] = useState<AttachmentHit[]>([]);
-  const [visible, setVisible] = useState(false);
-  const [checkList, setCheckList] = useState<string[]>([]);
+    const {sessionId} = props;
+    const {t} = useTranslation();
 
-  const serverId = useMemo(() => {
-    return currentService.id;
-  }, [currentService]);
+    const isTauri = useAppStore((state) => state.isTauri);
+    const currentService = useConnectStore((state) => state.currentService);
+    const [uploadedFiles, setUploadedFiles] = useState<AttachmentHit[]>([]);
+    const [visible, setVisible] = useState(false);
+    const [checkList, setCheckList] = useState<string[]>([]);
 
-  useEffect(() => {
-    setUploadedFiles([]);
+    const serverId = useMemo(() => {
+        return currentService.id;
+    }, [currentService]);
 
-    getUploadedFiles();
-  }, [sessionId]);
+    useEffect(() => {
+        setUploadedFiles([]);
 
-  const getUploadedFiles = async () => {
-    const response = await getAttachment({ serverId, sessionId });
+        getUploadedFiles();
+    }, [sessionId]);
 
-    setUploadedFiles(response.hits.hits);
-  };
+    const getUploadedFiles = async () => {
+        if (isTauri) {
+            const response: any = await platformAdapter.commands("get_attachment", {
+                serverId,
+                sessionId,
+            });
 
-  const handleDelete = async (id: string) => {
-    const result = await deleteAttachment({ serverId, id });
+            setUploadedFiles(response?.hits?.hits ?? []);
+        } else {
+        }
+    };
 
-    if (!result) return;
+    const handleDelete = async (id: string) => {
+        let result;
+        if (isTauri) {
+            result = await platformAdapter.commands("delete_attachment", {
+                serverId,
+                id,
+            });
+        } else {
+        }
+        if (!result) return;
 
-    getUploadedFiles();
-  };
+        getUploadedFiles();
+    };
 
-  const handleCheckAll = (checked: boolean) => {
-    if (checked) {
-      setCheckList(uploadedFiles.map((item) => item._source.id));
-    } else {
-      setCheckList([]);
-    }
-  };
+    const handleCheckAll = (checked: boolean) => {
+        if (checked) {
+            setCheckList(uploadedFiles?.map((item) => item?._source?.id));
+        } else {
+            setCheckList([]);
+        }
+    };
 
-  const handleCheck = (checked: boolean, id: string) => {
-    if (checked) {
-      setCheckList([...checkList, id]);
-    } else {
-      setCheckList(checkList.filter((item) => item !== id));
-    }
-  };
+    const handleCheck = (checked: boolean, id: string) => {
+        if (checked) {
+            setCheckList([...checkList, id]);
+        } else {
+            setCheckList(checkList.filter((item) => item !== id));
+        }
+    };
 
-  return (
-    <div
-      className={clsx("select-none", {
-        hidden: uploadedFiles.length === 0,
-      })}
-    >
-      <div
-        className="absolute top-4 right-4 flex items-center justify-center size-8 rounded-lg bg-[#0072FF] cursor-pointer"
-        onClick={() => {
-          setVisible(true);
-        }}
-      >
-        <Files className="size-5 text-white" />
+    return (
+        <div
+            className={clsx("select-none", {
+                hidden: uploadedFiles?.length === 0,
+            })}
+        >
+            <div
+                className="absolute top-4 right-4 flex items-center justify-center size-8 rounded-lg bg-[#0072FF] cursor-pointer"
+                onClick={() => {
+                    setVisible(true);
+                }}
+            >
+                <Files className="size-5 text-white"/>
 
-        <div className="absolute -top-2 -right-2 flex items-center justify-center min-w-4 h-4 px-1 text-white text-xs rounded-full bg-[#3DB954]">
-          {uploadedFiles.length}
-        </div>
-      </div>
+                <div
+                    className="absolute -top-2 -right-2 flex items-center justify-center min-w-4 h-4 px-1 text-white text-xs rounded-full bg-[#3DB954]">
+                    {uploadedFiles?.length}
+                </div>
+            </div>
 
-      <div
-        className={clsx(
-          "absolute inset-0 flex flex-col p-4 bg-white dark:bg-black",
-          {
-            hidden: !visible,
-          }
-        )}
-      >
-        <X
-          className="absolute top-4 right-4 size-5 text-[#999] cursor-pointer"
-          onClick={() => {
-            setVisible(false);
-          }}
-        />
+            <div
+                className={clsx(
+                    "absolute inset-0 flex flex-col p-4 bg-white dark:bg-black",
+                    {
+                        hidden: !visible,
+                    }
+                )}
+            >
+                <X
+                    className="absolute top-4 right-4 size-5 text-[#999] cursor-pointer"
+                    onClick={() => {
+                        setVisible(false);
+                    }}
+                />
 
-        <div className="mb-2 text-sm text-[#333] dark:text-[#D8D8D8] font-bold">
-          {t("assistant.sessionFile.title")}
-        </div>
-        <div className="flex items-center justify-between pr-2">
+                <div className="mb-2 text-sm text-[#333] dark:text-[#D8D8D8] font-bold">
+                    {t("assistant.sessionFile.title")}
+                </div>
+                <div className="flex items-center justify-between pr-2">
           <span className="text-sm text-[#999]">
             {t("assistant.sessionFile.description")}
           </span>
 
-          <Checkbox
-            indeterminate
-            checked={checkList.length === uploadedFiles.length}
-            onChange={handleCheckAll}
-          />
-        </div>
-        <ul className="flex-1 overflow-auto flex flex-col gap-2 mt-6">
-          {uploadedFiles.map((item) => {
-            const { id, name, icon, size } = item._source;
+                    <Checkbox
+                        indeterminate
+                        checked={checkList?.length === uploadedFiles?.length}
+                        onChange={handleCheckAll}
+                    />
+                </div>
+                <ul className="flex-1 overflow-auto flex flex-col gap-2 mt-6 p-0">
+                    {uploadedFiles?.map((item) => {
+                        const {id, name, icon, size} = item._source;
 
-            return (
-              <li
-                key={id}
-                className="flex items-center justify-between min-h-12 px-2  rounded-[4px] bg-[#ededed] dark:bg-[#202126]"
-              >
-                <div className="flex items-center gap-2">
-                  <FileIcon extname={icon} />
+                        return (
+                            <li
+                                key={id}
+                                className="flex items-center justify-between min-h-12 px-2  rounded-[4px] bg-[#ededed] dark:bg-[#202126]"
+                            >
+                                <div className="flex items-center gap-2">
+                                    <FileIcon extname={icon}/>
 
-                  <div>
-                    <div className="text-sm leading-4 text-[#333] dark:text-[#D8D8D8]">
-                      {name}
-                    </div>
-                    <div className="text-xs text-[#999]">
-                      <span>{icon}</span>
-                      <span className="pl-2">
-                        {filesize(size, { standard: "jedec", spacer: "" })}
+                                    <div>
+                                        <div className="text-sm leading-4 text-[#333] dark:text-[#D8D8D8]">
+                                            {name}
+                                        </div>
+                                        <div className="text-xs text-[#999]">
+                                            <span>{icon}</span>
+                                            <span className="pl-2">
+                        {filesize(size, {standard: "jedec", spacer: ""})}
                       </span>
-                    </div>
-                  </div>
-                </div>
+                                        </div>
+                                    </div>
+                                </div>
 
-                <div className="flex items-center gap-2">
-                  <Trash2
-                    className="size-4 text-[#999] cursor-pointer"
-                    onClick={() => handleDelete(id)}
-                  />
+                                <div className="flex items-center gap-2">
+                                    <Trash2
+                                        className="size-4 text-[#999] cursor-pointer"
+                                        onClick={() => handleDelete(id)}
+                                    />
 
-                  <Checkbox
-                    checked={checkList.includes(id)}
-                    onChange={(checked) => handleCheck(checked, id)}
-                  />
-                </div>
-              </li>
-            );
-          })}
-        </ul>
-      </div>
-    </div>
-  );
+                                    <Checkbox
+                                        checked={checkList.includes(id)}
+                                        onChange={(checked) => handleCheck(checked, id)}
+                                    />
+                                </div>
+                            </li>
+                        );
+                    })}
+                </ul>
+            </div>
+        </div>
+    );
 };
 
 export default SessionFile;

src/components/Assistant/Splash.tsx

@@ -0,0 +1,160 @@
+import { useMemo, useState } from "react";
+import { CircleX, MoveRight } from "lucide-react";
+import { useMount } from "ahooks";
+
+import { useAppStore } from "@/stores/appStore";
+import platformAdapter from "@/utils/platformAdapter";
+import { useConnectStore } from "@/stores/connectStore";
+import { useThemeStore } from "@/stores/themeStore";
+import FontIcon from "../Common/Icons/FontIcon";
+import logoImg from "@/assets/icon.svg";
+import { Get } from "@/api/axiosRequest";
+
+interface StartPage {
+  enabled?: boolean;
+  logo?: {
+    light?: string;
+    dark?: string;
+  };
+  introduction?: string;
+  display_assistants?: string[];
+}
+
+export interface Response {
+  app_settings?: {
+    chat?: {
+      start_page?: StartPage;
+    };
+  };
+}
+
+const Splash = () => {
+  const isTauri = useAppStore((state) => state.isTauri);
+  const currentService = useConnectStore((state) => state.currentService);
+  const [settings, setSettings] = useState<StartPage>();
+  const visibleStartPage = useConnectStore((state) => state.visibleStartPage);
+  const setVisibleStartPage = useConnectStore((state) => {
+    return state.setVisibleStartPage;
+  });
+  const addError = useAppStore((state) => state.addError);
+  const isDark = useThemeStore((state) => state.isDark);
+  const assistantList = useConnectStore((state) => state.assistantList);
+  const setCurrentAssistant = useConnectStore((state) => {
+    return state.setCurrentAssistant;
+  });
+
+  useMount(async () => {
+    try {
+      const serverId = currentService.id;
+
+      let response: Response = {};
+
+      if (isTauri) {
+        response = await platformAdapter.invokeBackend<Response>(
+          "get_system_settings",
+          {
+            serverId,
+          }
+        );
+      } else {
+        const [err, result] = await Get("/settings");
+
+        if (err) {
+          throw new Error(err);
+        }
+
+        response = result as Response;
+      }
+
+      const settings = response?.app_settings?.chat?.start_page;
+
+      setVisibleStartPage(Boolean(settings?.enabled));
+
+      setSettings(settings);
+    } catch (error) {
+      addError(String(error), "error");
+    }
+  });
+
+  const settingsAssistantList = useMemo(() => {
+    console.log("assistantList", assistantList);
+
+    return assistantList.filter((item) => {
+      return settings?.display_assistants?.includes(item?._source?.id);
+    });
+  }, [settings, assistantList]);
+
+  const logo = useMemo(() => {
+    const { light, dark } = settings?.logo || {};
+
+    if (isDark) {
+      return dark || light;
+    }
+
+    return light || dark;
+  }, [settings, isDark]);
+
+  return (
+    visibleStartPage && (
+      <div className="absolute inset-0 flex flex-col items-center px-6 pt-6 text-[#333] dark:text-white select-none overflow-y-auto custom-scrollbar">
+        <CircleX
+          className="absolute top-3 right-3 size-4 text-[#999] cursor-pointer"
+          onClick={() => {
+            setVisibleStartPage(false);
+          }}
+        />
+
+        <img src={logo} className="h-8" />
+
+        <div className="mt-3 mb-6 text-lg font-medium">
+          {settings?.introduction}
+        </div>
+
+        <ul className="flex flex-wrap -m-1 w-full p-0">
+          {settingsAssistantList?.map((item) => {
+            const { id, name, description, icon } = item._source;
+
+            return (
+              <li key={id} className="w-1/2 p-1">
+                <div
+                  className="group h-[74px] px-3 py-2 text-sm rounded-xl border dark:border-[#262626] bg-white dark:bg-black cursor-pointer transition hover:!border-[#0087FF]"
+                  onClick={() => {
+                    setCurrentAssistant(item);
+
+                    setVisibleStartPage(false);
+                  }}
+                >
+                  <div className="flex items-center justify-between">
+                    <div className="flex items-center gap-1">
+                      {icon?.startsWith("font_") ? (
+                        <div className="size-4 flex items-center justify-center rounded-full bg-white">
+                          <FontIcon name={icon} className="w-5 h-5" />
+                        </div>
+                      ) : (
+                        <img
+                          src={logoImg}
+                          className="size-4 rounded-full"
+                          alt={name}
+                        />
+                      )}
+
+                      <span>{name}</span>
+                    </div>
+
+                    <MoveRight className="size-4 transition group-hover:text-[#0087FF]" />
+                  </div>
+
+                  <div className="mt-1 text-xs text-[#999] line-clamp-2">
+                    {description}
+                  </div>
+                </div>
+              </li>
+            );
+          })}
+        </ul>
+      </div>
+    )
+  );
+};
+
+export default Splash;

src/components/Assistant/types.ts

@@ -15,6 +15,7 @@ export interface ISource {
   title?: string;
   question?: string;
   details?: any[];
+  assistant_id?: string;
 }
 export interface Chat {
   _id: string;

src/components/AudioRecording/index.tsx

@@ -1,5 +1,4 @@
-import { useAppStore } from "@/stores/appStore";
-import { useKeyPress, useReactive } from "ahooks";
+import { useReactive } from "ahooks";
 import clsx from "clsx";
 import { Check, Loader, Mic, X } from "lucide-react";
 import { FC, useEffect, useRef } from "react";
@@ -9,9 +8,12 @@ import {
 } from "tauri-plugin-macos-permissions-api";
 import { useWavesurfer } from "@wavesurfer/react";
 import RecordPlugin from "wavesurfer.js/dist/plugins/record.esm.js";
-import { transcription } from "@/api/transcription";
+
 import { useConnectStore } from "@/stores/connectStore";
 import { useShortcutsStore } from "@/stores/shortcutsStore";
+import VisibleKey from "@/components/Common/VisibleKey";
+import { useAppStore } from "@/stores/appStore";
+import platformAdapter from "@/utils/platformAdapter";
 
 interface AudioRecordingProps {
   onChange?: (text: string) => void;
@@ -40,12 +42,6 @@ const AudioRecording: FC<AudioRecordingProps> = (props) => {
   const recordRef = useRef<RecordPlugin>();
   const withVisibility = useAppStore((state) => state.withVisibility);
   const currentService = useConnectStore((state) => state.currentService);
-  const modifierKeyPressed = useShortcutsStore((state) => {
-    return state.modifierKeyPressed;
-  });
-  const modifierKey = useShortcutsStore((state) => {
-    return state.modifierKey;
-  });
   const voiceInput = useShortcutsStore((state) => state.voiceInput);
 
   const { wavesurfer } = useWavesurfer({
@@ -82,7 +78,7 @@ const AudioRecording: FC<AudioRecordingProps> = (props) => {
       reader.onloadend = async () => {
         const base64Audio = (reader.result as string).split(",")[1];
 
-        const response = await transcription({
+        const response: any = await platformAdapter.commands("transcription", {
           serverId: currentService.id,
           audioType: "mp3",
           audioContent: base64Audio,
@@ -113,10 +109,6 @@ const AudioRecording: FC<AudioRecordingProps> = (props) => {
     }, 1000);
   }, [state.isRecording]);
 
-  useKeyPress(`${modifierKey}.${voiceInput}`, () => {
-    startRecording();
-  });
-
   const getAvailableAudioDevices = async () => {
     state.audioDevices = await RecordPlugin.getAvailableAudioDevices();
   };
@@ -171,23 +163,9 @@ const AudioRecording: FC<AudioRecordingProps> = (props) => {
           }
         )}
       >
-        <Mic
-          className={clsx("size-4 text-[#999]", {
-            hidden: modifierKeyPressed,
-          })}
-          onClick={startRecording}
-        />
-
-        <div
-          className={clsx(
-            "w-4 h-4 flex items-center justify-center font-normal text-xs text-[#333] leading-[14px] bg-[#ccc] dark:bg-[#6B6B6B] rounded-md shadow-[-6px_0px_6px_2px_#fff] dark:shadow-[-6px_0px_6px_2px_#000]",
-            {
-              hidden: !modifierKeyPressed,
-            }
-          )}
-        >
-          {voiceInput}
-        </div>
+        <VisibleKey shortcut={voiceInput} onKeyPress={startRecording}>
+          <Mic className="size-4 text-[#999]" onClick={startRecording} />
+        </VisibleKey>
       </div>
 
       <div

src/components/ChatMessage/CallTools.tsx

@@ -0,0 +1,82 @@
+import { Loader, Hammer, ChevronDown, ChevronUp } from "lucide-react";
+import { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { IChunkData } from "@/components/Assistant/types";
+import Markdown from "./Markdown";
+
+interface CallToolsProps {
+  Detail?: any;
+  ChunkData?: IChunkData;
+  loading?: boolean;
+}
+
+export const CallTools = ({ Detail, ChunkData, loading }: CallToolsProps) => {
+  const { t } = useTranslation();
+  const [isThinkingExpanded, setIsThinkingExpanded] = useState(false);
+
+  const [data, setData] = useState("");
+
+  useEffect(() => {
+    if (!Detail?.description) return;
+    setData(Detail?.description);
+  }, [Detail?.description]);
+
+  useEffect(() => {
+    if (!ChunkData?.message_chunk) return;
+    setData(ChunkData?.message_chunk);
+  }, [ChunkData?.message_chunk, data]);
+
+  // Must be after hooks !!!
+  if (!ChunkData && !Detail) return null;
+
+  return (
+    <div className="space-y-2 mb-3 w-full">
+      <button
+        onClick={() => setIsThinkingExpanded((prev) => !prev)}
+        className="inline-flex items-center gap-2 px-2 py-1 rounded-xl transition-colors border border-[#E6E6E6] dark:border-[#272626]"
+      >
+        {loading ? (
+          <>
+            <Loader className="w-4 h-4 animate-spin text-[#1990FF]" />
+            <span className="text-xs text-[#999999] italic">
+              {t(`assistant.message.steps.${ChunkData?.chunk_type}`)}
+            </span>
+          </>
+        ) : (
+          <>
+            <Hammer className="w-4 h-4 text-[#38C200]" />
+            <span className="text-xs text-[#999999]">
+              {t(`assistant.message.steps.${ChunkData?.chunk_type}`)}
+            </span>
+          </>
+        )}
+
+        {isThinkingExpanded ? (
+          <ChevronUp className="w-4 h-4" />
+        ) : (
+          <ChevronDown className="w-4 h-4" />
+        )}
+      </button>
+      {isThinkingExpanded && (
+        <div className="pl-2 border-l-2 border-[#e5e5e5] dark:border-[#4e4e56]">
+          <div className="text-[#8b8b8b] dark:text-[#a6a6a6] space-y-2">
+            <Markdown
+              content={data || ""}
+              loading={loading}
+              onDoubleClickCapture={() => {}}
+            />
+            {/* {data?.split("\n").map(
+              (paragraph, idx) =>
+                paragraph.trim() && (
+                  <p key={idx} className="text-sm">
+                    {paragraph}
+                  </p>
+                )
+            )} */}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};

src/components/ChatMessage/DeepRead.tsx

@@ -20,7 +20,7 @@ export const DeepRead = ({
 
   const [isThinkingExpanded, setIsThinkingExpanded] = useState(false);
 
-  const [Data, setData] = useState<string[]>([]);
+  const [data, setData] = useState<string[]>([]);
   const [description, setDescription] = useState("");
 
   useEffect(() => {
@@ -42,7 +42,7 @@ export const DeepRead = ({
     }
   }, [ChunkData?.message_chunk]);
 
-  // Must be after hooks ！！！
+  // Must be after hooks !!!
   if (!ChunkData && !Detail) return null;
 
   return (
@@ -71,7 +71,7 @@ export const DeepRead = ({
                   ChunkData?.chunk_type || Detail?.type
                 }`,
                 {
-                  count: Number(Data.length),
+                  count: Number(data.length),
                 }
               )}
             </span>
@@ -84,10 +84,10 @@ export const DeepRead = ({
         )}
       </button>
       {isThinkingExpanded && (
-        <div className="pl-2 border-l-2 border-[e5e5e5]">
+        <div className="pl-2 border-l-2 border-[#e5e5e5] dark:border-[#4e4e56]">
           <div className="text-[#8b8b8b] dark:text-[#a6a6a6] space-y-2">
             <div className="mb-4 space-y-3 text-xs">
-              {Data?.map((item) => (
+              {data?.map((item) => (
                 <div key={item} className="flex flex-col gap-2">
                   <div className="text-xs text-[#999999] dark:text-[#808080]">
                     - {item}

src/components/ChatMessage/FetchSource.tsx

@@ -34,8 +34,13 @@ interface ISourceData {
   url: string;
 }
 
-export const FetchSource = ({ Detail, ChunkData }: FetchSourceProps) => {
+export const FetchSource = ({
+  Detail,
+  ChunkData,
+  loading,
+}: FetchSourceProps) => {
   const { t } = useTranslation();
+
   const [isSourceExpanded, setIsSourceExpanded] = useState(false);
 
   const [total, setTotal] = useState(0);
@@ -51,30 +56,34 @@ export const FetchSource = ({ Detail, ChunkData }: FetchSourceProps) => {
   useEffect(() => {
     if (!ChunkData?.message_chunk) return;
 
-    try {
-      const match = ChunkData.message_chunk.match(
-        /\u003cPayload total=(\d+)\u003e/
-      );
-      if (match) {
-        setTotal(Number(match[1]));
-      }
+    if (!loading) {
+      try {
+        const match = ChunkData.message_chunk.match(
+          // /\u003cPayload total=(\d+)\u003e/
+          /<Payload total=(\d+)>/
+        );
+        if (match) {
+          setTotal(Number(match[1]));
+        }
 
-      const jsonMatch = ChunkData.message_chunk.match(/\[(.*)\]/s);
-      if (jsonMatch) {
-        const jsonData = JSON.parse(jsonMatch[0]);
-        setData(jsonData);
+        // const jsonMatch = ChunkData.message_chunk.match(/\[(.*)\]/s);
+        const jsonMatch = ChunkData.message_chunk.match(/\[([\s\S]*)\]/);
+        if (jsonMatch) {
+          const jsonData = JSON.parse(jsonMatch[0]);
+          setData(jsonData);
+        }
+      } catch (e) {
+        console.error("Failed to parse fetch source data:", e);
       }
-    } catch (e) {
-      console.error("Failed to parse fetch source data:", e);
     }
-  }, [ChunkData?.message_chunk]);
+  }, [ChunkData?.message_chunk, loading]);
 
-  // Must be after hooks ！！！
+  // Must be after hooks !!!
   if (!ChunkData && !Detail) return null;
 
   return (
     <div
-      className={`mt-2 mb-2 w-[610px] ${
+      className={`mt-2 mb-2 max-w-full w-full md:w-[610px] ${
         isSourceExpanded
           ? "rounded-lg overflow-hidden border border-[#E6E6E6] dark:border-[#272626]"
           : ""
@@ -120,15 +129,17 @@ export const FetchSource = ({ Detail, ChunkData }: FetchSourceProps) => {
               className="group flex items-center p-2 hover:bg-[#F7F7F7] dark:hover:bg-[#2C2C2C] border-b border-[#E6E6E6] dark:border-[#272626] last:border-b-0 cursor-pointer transition-colors"
             >
               <div className="w-full flex items-center gap-2">
-                <div className="w-[75%] flex items-center gap-1">
+                <div className="w-[75%] mobile:w-full flex items-center gap-1">
                   <Globe className="w-3 h-3 flex-shrink-0" />
                   <div className="text-xs text-[#333333] dark:text-[#D8D8D8] truncate font-normal group-hover:text-[#0072FF] dark:group-hover:text-[#0072FF]">
                     {item.title || item.category}
                   </div>
                 </div>
-                <div className="w-[25%] flex items-center justify-end gap-2">
+                <div
+                  className={`flex-1 mobile:hidden flex items-center justify-end gap-2`}
+                >
                   <span className="text-xs text-[#999999] dark:text-[#999999] truncate">
-                    {item.source?.name}
+                    {item.source?.name || item?.category}
                   </span>
                   <SquareArrowOutUpRight className="w-3 h-3 text-[#999999] dark:text-[#999999] flex-shrink-0" />
                 </div>

src/components/ChatMessage/Markdown.tsx

@@ -9,11 +9,12 @@ import RehypeHighlight from "rehype-highlight";
 import mermaid from "mermaid";
 import { useDebouncedCallback } from "use-debounce";
 
-import { copyToClipboard, 
-  // useWindowSize 
+import {
+  copyToClipboard,
+  // useWindowSize
 } from "@/utils";
 
-import "./markdown.css";
+import "./markdown.scss";
 import "./highlight.css";
 
 // 8
@@ -296,18 +297,20 @@ export default function Markdown(
   const mdRef = useRef<HTMLDivElement>(null);
 
   return (
-    <div
-      className="markdown-body"
-      style={{
-        fontSize: `${props.fontSize ?? 14}px`,
-        fontFamily: props.fontFamily || "inherit",
-      }}
-      ref={mdRef}
-      onContextMenu={props.onContextMenu}
-      onDoubleClickCapture={props.onDoubleClickCapture}
-      dir="auto"
-    >
-      <MarkdownContent content={props.content} />
+    <div className="coco-chat">
+      <div
+        className="markdown-body"
+        style={{
+          fontSize: `${props.fontSize ?? 14}px`,
+          fontFamily: props.fontFamily || "inherit",
+        }}
+        ref={mdRef}
+        onContextMenu={props.onContextMenu}
+        onDoubleClickCapture={props.onDoubleClickCapture}
+        dir="auto"
+      >
+        <MarkdownContent content={props.content} />
+      </div>
     </div>
   );
 }

src/components/ChatMessage/PickSource.tsx

@@ -26,7 +26,7 @@ export const PickSource = ({
 
   const [isThinkingExpanded, setIsThinkingExpanded] = useState(false);
 
-  const [Data, setData] = useState<IData[]>([]);
+  const [data, setData] = useState<IData[]>([]);
 
   useEffect(() => {
     if (!Detail?.payload) return;
@@ -65,7 +65,7 @@ export const PickSource = ({
     }
   }, [ChunkData?.message_chunk, loading]);
 
-  // Must be after hooks ！！！
+  // Must be after hooks !!!
   if (!ChunkData && !Detail) return null;
 
   return (
@@ -90,7 +90,7 @@ export const PickSource = ({
                   ChunkData?.chunk_type || Detail.type
                 }`,
                 {
-                  count: Data?.length,
+                  count: data?.length,
                 }
               )}
             </span>
@@ -103,10 +103,10 @@ export const PickSource = ({
         )}
       </button>
       {isThinkingExpanded && (
-        <div className="pl-2 border-l-2 border-[e5e5e5]">
+        <div className="pl-2 border-l-2 border-[#e5e5e5] dark:border-[#4e4e56]">
           <div className="text-[#8b8b8b] dark:text-[#a6a6a6] space-y-2">
             <div className="mb-4 space-y-3 text-xs">
-              {Data?.map((item) => (
+              {data?.map((item) => (
                 <div
                   key={item.id}
                   className="p-3 rounded-lg border border-[#E6E6E6] dark:border-[#272626] bg-white dark:bg-[#1E1E1E] hover:bg-gray-50 dark:hover:bg-[#2C2C2C] transition-colors"

src/components/ChatMessage/PrevSuggestion.tsx

@@ -0,0 +1,45 @@
+import { MoveRight } from "lucide-react";
+import { FC, useEffect, useState } from "react";
+
+import { useConnectStore } from "@/stores/connectStore";
+
+interface PrevSuggestionProps {
+  sendMessage: (message: string) => void;
+}
+
+const PrevSuggestion: FC<PrevSuggestionProps> = (props) => {
+  const { sendMessage } = props;
+
+  const currentAssistant = useConnectStore((state) => state.currentAssistant);
+
+  const [list, setList] = useState<string[]>([]);
+
+  useEffect(() => {
+    const suggested = currentAssistant?._source?.chat_settings?.suggested || {};
+    if (suggested.enabled) {
+      setList(suggested.questions || []);
+    } else {
+      setList([]);
+    }
+  }, [JSON.stringify(currentAssistant)]);
+
+  return (
+    <ul className="absolute left-2 bottom-2 flex flex-col gap-2 p-0">
+      {list.map((item) => {
+        return (
+          <li
+            key={item}
+            className="flex items-center self-start gap-2 px-3 py-2 leading-4 text-sm text-[#333] dark:text-[#d8d8d8] rounded-xl border border-black/15 dark:border-white/15 hover:!border-[#0072ff] hover:!text-[#0072ff] transition cursor-pointer"
+            onClick={() => sendMessage(item)}
+          >
+            {item}
+
+            <MoveRight className="size-4" />
+          </li>
+        );
+      })}
+    </ul>
+  );
+};
+
+export default PrevSuggestion;

src/components/ChatMessage/QueryIntent.tsx

@@ -30,7 +30,7 @@ export const QueryIntent = ({
 
   const [isThinkingExpanded, setIsThinkingExpanded] = useState(false);
 
-  const [Data, setData] = useState<IQueryData | null>(null);
+  const [data, setData] = useState<IQueryData | null>(null);
 
   useEffect(() => {
     if (!Detail?.payload) return;
@@ -66,7 +66,7 @@ export const QueryIntent = ({
     }
   }, [ChunkData?.message_chunk]);
 
-  // Must be after hooks ！！！
+  // Must be after hooks !!!
   if (!ChunkData && !Detail) return null;
 
   return (
@@ -97,16 +97,16 @@ export const QueryIntent = ({
         )}
       </button>
       {isThinkingExpanded && (
-        <div className="pl-2 border-l-2 border-[e5e5e5]">
+        <div className="pl-2 border-l-2 border-[#e5e5e5] dark:border-[#4e4e56]">
           <div className="text-[#8b8b8b] dark:text-[#a6a6a6] space-y-2">
             <div className="mb-4 space-y-2 text-xs">
-              {Data?.keyword ? (
+              {data?.keyword ? (
                 <div className="flex gap-1">
                   <span className="text-[#999999]">
                     - {t("assistant.message.steps.keywords")}：
                   </span>
                   <div className="flex flex-wrap gap-1">
-                    {Data?.keyword?.map((keyword, index) => (
+                    {data?.keyword?.map((keyword, index) => (
                       <span
                         key={keyword + index}
                         className="text-[#333333] dark:text-[#D8D8D8]"
@@ -118,33 +118,33 @@ export const QueryIntent = ({
                   </div>
                 </div>
               ) : null}
-              {Data?.category ? (
+              {data?.category ? (
                 <div className="flex items-center gap-1">
                   <span className="text-[#999999]">
                     - {t("assistant.message.steps.questionType")}：
                   </span>
                   <span className="text-[#333333] dark:text-[#D8D8D8]">
-                    {Data?.category}
+                    {data?.category}
                   </span>
                 </div>
               ) : null}
-              {Data?.intent ? (
+              {data?.intent ? (
                 <div className="flex items-start gap-1">
                   <span className="text-[#999999]">
                     - {t("assistant.message.steps.userIntent")}：
                   </span>
                   <div className="flex-1 text-[#333333] dark:text-[#D8D8D8]">
-                    {Data?.intent}
+                    {data?.intent}
                   </div>
                 </div>
               ) : null}
-              {Data?.query ? (
+              {data?.query ? (
                 <div className="flex items-start gap-1">
                   <span className="text-[#999999]">
                     - {t("assistant.message.steps.relatedQuestions")}：
                   </span>
                   <div className="flex-1 flex flex-col text-[#333333] dark:text-[#D8D8D8]">
-                    {Data?.query?.map((question, qIndex) => (
+                    {data?.query?.map((question, qIndex) => (
                       <span key={question + qIndex}>- {question}</span>
                     ))}
                   </div>

src/components/ChatMessage/Think.tsx

@@ -14,7 +14,7 @@ export const Think = ({ Detail, ChunkData, loading }: ThinkProps) => {
   const { t } = useTranslation();
   const [isThinkingExpanded, setIsThinkingExpanded] = useState(true);
 
-  const [Data, setData] = useState("");
+  const [data, setData] = useState("");
 
   useEffect(() => {
     if (!Detail?.description) return;
@@ -24,9 +24,9 @@ export const Think = ({ Detail, ChunkData, loading }: ThinkProps) => {
   useEffect(() => {
     if (!ChunkData?.message_chunk) return;
     setData(ChunkData?.message_chunk);
-  }, [ChunkData?.message_chunk, Data]);
+  }, [ChunkData?.message_chunk, data]);
 
-  // Must be after hooks ！！！
+  // Must be after hooks !!!
   if (!ChunkData && !Detail) return null;
 
   return (
@@ -57,9 +57,9 @@ export const Think = ({ Detail, ChunkData, loading }: ThinkProps) => {
         )}
       </button>
       {isThinkingExpanded && (
-        <div className="pl-2 border-l-2 border-[e5e5e5]">
+        <div className="pl-2 border-l-2 border-[#e5e5e5] dark:border-[#4e4e56]">
           <div className="text-[#8b8b8b] dark:text-[#a6a6a6] space-y-2">
-            {Data?.split("\n").map(
+            {data?.split("\n").map(
               (paragraph, idx) =>
                 paragraph.trim() && (
                   <p key={idx} className="text-sm">

src/components/ChatMessage/UserMessage.tsx

@@ -1,4 +1,5 @@
 import { useState } from "react";
+import clsx from "clsx";
 
 import { CopyButton } from "@/components/Common/CopyButton";
 
@@ -15,7 +16,13 @@ export const UserMessage = ({ messageContent }: UserMessageProps) => {
       onMouseEnter={() => setShowCopyButton(true)}
       onMouseLeave={() => setShowCopyButton(false)}
     >
-      {showCopyButton && <CopyButton textToCopy={messageContent} />}
+      <div
+        className={clsx("size-6 transition", {
+          "opacity-0": !showCopyButton,
+        })}
+      >
+        <CopyButton textToCopy={messageContent} />
+      </div>
       <div
         className="px-3 py-2 bg-white dark:bg-[#202126] rounded-xl border border-black/12 dark:border-black/15 font-normal text-sm text-[#333333] dark:text-[#D8D8D8] cursor-pointer select-none"
         onDoubleClick={(e) => {

src/components/ChatMessage/index.tsx

@@ -1,9 +1,11 @@
-import { memo, useState } from "react";
+import { memo, useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
+import clsx from "clsx";
 
 import logoImg from "@/assets/icon.svg";
 import type { Message, IChunkData } from "@/components/Assistant/types";
 import { QueryIntent } from "./QueryIntent";
+import { CallTools } from "./CallTools";
 import { FetchSource } from "./FetchSource";
 import { PickSource } from "./PickSource";
 import { DeepRead } from "./DeepRead";
@@ -12,11 +14,14 @@ import { MessageActions } from "./MessageActions";
 import Markdown from "./Markdown";
 import { SuggestionList } from "./SuggestionList";
 import { UserMessage } from "./UserMessage";
+import { useConnectStore } from "@/stores/connectStore";
+import FontIcon from "@/components/Common/Icons/FontIcon";
 
 interface ChatMessageProps {
   message: Message;
   isTyping?: boolean;
   query_intent?: IChunkData;
+  tools?: IChunkData;
   fetch_source?: IChunkData;
   pick_source?: IChunkData;
   deep_read?: IChunkData;
@@ -30,6 +35,7 @@ export const ChatMessage = memo(function ChatMessage({
   message,
   isTyping,
   query_intent,
+  tools,
   fetch_source,
   pick_source,
   deep_read,
@@ -40,7 +46,24 @@ export const ChatMessage = memo(function ChatMessage({
 }: ChatMessageProps) {
   const { t } = useTranslation();
 
+  const currentAssistant = useConnectStore((state) => state.currentAssistant);
+  const assistantList = useConnectStore((state) => state.assistantList);
+  const [assistant, setAssistant] = useState<any>({});
+
   const isAssistant = message?._source?.type === "assistant";
+  const assistant_id = message?._source?.assistant_id;
+
+  useEffect(() => {
+    let target = currentAssistant;
+    if (isAssistant && assistant_id && Array.isArray(assistantList)) {
+      const found = assistantList.find((item) => item._id === assistant_id);
+      if (found) {
+        target = found;
+      }
+    }
+    setAssistant(target);
+  }, [isAssistant, assistant_id, assistantList, currentAssistant]);
+
   const messageContent = message?._source?.message || "";
   const details = message?._source?.details || [];
   const question = message?._source?.question || "";
@@ -49,6 +72,7 @@ export const ChatMessage = memo(function ChatMessage({
     isTyping === false && (messageContent || response?.message_chunk);
 
   const [suggestion, setSuggestion] = useState<string[]>([]);
+  const visibleStartPage = useConnectStore((state) => state.visibleStartPage);
 
   const getSuggestion = (suggestion: string[]) => {
     setSuggestion(suggestion);
@@ -67,6 +91,13 @@ export const ChatMessage = memo(function ChatMessage({
           getSuggestion={getSuggestion}
           loading={loadingStep?.query_intent}
         />
+
+        <CallTools
+          Detail={details.find((item) => item.type === "tools")}
+          ChunkData={tools}
+          loading={loadingStep?.tools}
+        />
+
         <FetchSource
           Detail={details.find((item) => item.type === "fetch_source")}
           ChunkData={fetch_source}
@@ -117,7 +148,13 @@ export const ChatMessage = memo(function ChatMessage({
 
   return (
     <div
-      className={`py-8 flex ${isAssistant ? "justify-start" : "justify-end"}`}
+      className={clsx(
+        "py-8 flex",
+        [isAssistant ? "justify-start" : "justify-end"],
+        {
+          hidden: visibleStartPage,
+        }
+      )}
     >
       <div
         className={`px-4 flex gap-4 ${
@@ -125,20 +162,28 @@ export const ChatMessage = memo(function ChatMessage({
         }`}
       >
         <div
-          className={`space-y-2 ${isAssistant ? "text-left" : "text-right"}`}
+          className={`w-full space-y-2 ${
+            isAssistant ? "text-left" : "text-right"
+          }`}
         >
-          <p className="flex items-center gap-1 font-semibold text-sm text-[#333] dark:text-[#d8d8d8]">
+          <div className="w-full flex items-center gap-1 font-semibold text-sm text-[#333] dark:text-[#d8d8d8]">
             {isAssistant ? (
-              <img
-                src={logoImg}
-                className="w-6 h-6"
-                alt={t("assistant.message.logo")}
-              />
+              <div className="w-6 h-6 flex justify-center items-center rounded-full bg-white border border-[#E6E6E6]">
+                {assistant?._source?.icon?.startsWith("font_") ? (
+                  <FontIcon name={assistant._source.icon} className="w-4 h-4" />
+                ) : (
+                  <img
+                    src={logoImg}
+                    className="w-4 h-4"
+                    alt={t("assistant.message.logo")}
+                  />
+                )}
+              </div>
             ) : null}
-            {isAssistant ? t("assistant.message.aiName") : ""}
-          </p>
-          <div className="prose dark:prose-invert prose-sm max-w-none">
-            <div className="pl-7 text-[#333] dark:text-[#d8d8d8] leading-relaxed">
+            {isAssistant ? assistant?._source?.name || "Coco AI" : ""}
+          </div>
+          <div className="w-full prose dark:prose-invert prose-sm max-w-none">
+            <div className="w-full pl-7 text-[#333] dark:text-[#d8d8d8] leading-relaxed">
               {renderContent()}
             </div>
           </div>

src/components/Cloud/Cloud.tsx

@@ -44,8 +44,8 @@ export default function Cloud() {
 
   const SidebarRef = useRef<{ refreshData: () => void }>(null);
 
-  const error = useAppStore((state) => state.error);
-  const setError = useAppStore((state) => state.setError);
+  const errors = useAppStore((state) => state.errors);
+  const addError = useAppStore((state) => state.addError);
 
   const [isConnect, setIsConnect] = useState(true);
 
@@ -70,14 +70,13 @@ export default function Cloud() {
     console.log("currentService", currentService);
     setLoading(false);
     setRefreshLoading(false);
-    setError("");
     setIsConnect(true);
   }, [JSON.stringify(currentService)]);
 
   const fetchServers = async (resetSelection: boolean) => {
     list_coco_servers()
       .then((res: any) => {
-        if (error) {
+        if (errors.length > 0) {
           res = (res || []).map((item: any) => {
             if (item.id === currentService?.id) {
               item.health = {
@@ -102,7 +101,6 @@ export default function Cloud() {
         }
       })
       .catch((err: any) => {
-        setError(err);
         console.error(err);
       });
   };
@@ -123,21 +121,10 @@ export default function Cloud() {
     return add_coco_server(endpointLink)
       .then((res: any) => {
         // console.log("add_coco_server", res);
-        fetchServers(false)
-          .then((r) => {
-            console.log("fetchServers", r);
-            setCurrentService(res);
-          })
-          .catch((err: any) => {
-            console.error("fetchServers failed:", err);
-            setError(err);
-            throw err; // Propagate error back up to outer promise chain
-          });
-      })
-      .catch((err: any) => {
-        console.error("add coco server failed:", err);
-        setError(err);
-        throw err; // Propagate error back up
+        fetchServers(false).then((r) => {
+          console.log("fetchServers", r);
+          setCurrentService(res);
+        });
       })
       .finally(() => {
         setRefreshLoading(false);
@@ -147,7 +134,7 @@ export default function Cloud() {
   const handleOAuthCallback = useCallback(
     async (code: string | null, serverId: string | null) => {
       if (!code || !serverId) {
-        setError("No authorization code received");
+        addError("No authorization code received");
         return;
       }
 
@@ -163,15 +150,9 @@ export default function Cloud() {
           refreshClick(serverId);
         }
 
-        getCurrentWindow()
-          .setFocus()
-          .catch((err) => {
-            setError(err);
-          });
+        getCurrentWindow().setFocus();
       } catch (e) {
         console.error("Sign in failed:", e);
-        setError("SSO login failed: " + e);
-        throw error;
       } finally {
         setLoading(false);
       }
@@ -190,7 +171,7 @@ export default function Cloud() {
 
       if (reqId != ssoRequestID) {
         console.log("Request ID not matched, skip");
-        setError("Request ID not matched, skip");
+        addError("Request ID not matched, skip");
         return;
       }
 
@@ -198,7 +179,7 @@ export default function Cloud() {
       handleOAuthCallback(code, serverId);
     } catch (err) {
       console.error("Failed to parse URL:", err);
-      setError("Invalid URL format: " + err);
+      addError("Invalid URL format: " + err);
     }
   };
 
@@ -234,7 +215,7 @@ export default function Cloud() {
       })
       .catch((err) => {
         console.error("Failed to get initial URLs:", err);
-        setError("Failed to get initial URLs: " + err);
+        addError("Failed to get initial URLs: " + err);
       });
 
     const unlisten = onOpenUrl((urls) => handleUrl(urls[0]));
@@ -275,10 +256,6 @@ export default function Cloud() {
         setCurrentService(res);
         emit("login_or_logout", true);
       })
-      .catch((err: any) => {
-        setError(err);
-        console.error(err);
-      })
       .finally(() => {
         setRefreshLoading(false);
       });
@@ -297,45 +274,31 @@ export default function Cloud() {
         refreshClick(id);
         emit("login_or_logout", false);
       })
-      .catch((err: any) => {
-        setError(err);
-        console.error(err);
-      })
       .finally(() => {
         setRefreshLoading(false);
       });
   }
 
   const removeServer = (id: string) => {
-    remove_coco_server(id)
-      .then((res: any) => {
-        console.log("remove_coco_server", id, JSON.stringify(res));
-        fetchServers(true).then((r) => {
-          console.log("fetchServers", r);
-        });
-      })
-      .catch((err: any) => {
-        // TODO display the error message
-        setError(err);
-        console.error(err);
+    remove_coco_server(id).then((res: any) => {
+      console.log("remove_coco_server", id, JSON.stringify(res));
+      fetchServers(true).then((r) => {
+        console.log("fetchServers", r);
       });
+    });
   };
 
   const enable_coco_server = useCallback(
     async (enabled: boolean) => {
-      try {
-        if (enabled) {
-          await enable_server(currentService?.id);
-        } else {
-          await disable_server(currentService?.id);
-        }
-
-        setCurrentService({ ...currentService, enabled });
-
-        await fetchServers(false);
-      } catch (error) {
-        setError(error);
+      if (enabled) {
+        await enable_server(currentService?.id);
+      } else {
+        await disable_server(currentService?.id);
       }
+
+      setCurrentService({ ...currentService, enabled });
+
+      await fetchServers(false);
     },
     [currentService?.id]
   );
@@ -473,8 +436,7 @@ export default function Cloud() {
                           <Copy className="inline mr-2" />{" "}
                         </button>
                         <div className="text-justify italic text-xs">
-                          If the link did not open automatically, please copy
-                          and paste it into your browser manually.
+                          {t("cloud.manualCopyLink")}
                         </div>
                       </div>
                     )}

src/components/Cloud/Connect.tsx

@@ -13,9 +13,8 @@ export function Connect({ setIsConnect, onAddServer }: ConnectServiceProps) {
   const { t } = useTranslation();
   const [endpointLink, setEndpointLink] = useState("");
   const [refreshLoading] = useState(false);
-  const [errorMessage, setErrorMessage] = useState(""); // State to store the error message
 
-  const setError = useAppStore((state) => state.setError);
+  const addError = useAppStore((state) => state.addError);
 
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault();
@@ -36,17 +35,10 @@ export function Connect({ setIsConnect, onAddServer }: ConnectServiceProps) {
         typeof err === "string"
           ? err
           : err?.message || "An unknown error occurred.";
-      setErrorMessage("ERR:" + errorMessage);
-      setError(errorMessage);
-      console.error("Error:", errorMessage);
+      addError(errorMessage);
     }
   };
 
-  // Function to close the error message
-  const closeError = () => {
-    setErrorMessage("");
-  };
-
   return (
     <div className="max-w-4xl">
       <div className="flex items-center gap-2 mb-8">
@@ -96,31 +88,6 @@ export function Connect({ setIsConnect, onAddServer }: ConnectServiceProps) {
           </div>
         </div>
       </form>
-
-      {/*//TODO move to outer container, move error state to global*/}
-      {errorMessage && (
-        <div className="mb-8">
-          <div
-            style={{
-              color: "red",
-              marginTop: "10px",
-              display: "block", // Makes sure the error message starts on a new line
-              marginBottom: "10px",
-            }}
-          >
-            <span>{errorMessage}</span>
-            <button
-              onClick={closeError}
-              style={{
-                background: "none",
-                border: "none",
-                color: "red",
-                cursor: "pointer",
-              }}
-            ></button>
-          </div>
-        </div>
-      )}
     </div>
   );
 }

src/components/Cloud/DataSourceItem.tsx

@@ -5,6 +5,7 @@ import source_default_img from "@/assets/images/source_default.png";
 import source_default_dark_img from "@/assets/images/source_default_dark.png";
 import { useConnectStore } from "@/stores/connectStore";
 import { useThemeStore } from "@/stores/themeStore";
+import FontIcon from "../Common/Icons/FontIcon";
 
 interface Account {
   email: string;
@@ -13,11 +14,12 @@ interface Account {
 
 interface DataSourceItemProps {
   name: string;
+  icon?: string;
   connector: any;
   accounts?: Account[];
 }
 
-export function DataSourceItem({ name, connector }: DataSourceItemProps) {
+export function DataSourceItem({ name, icon, connector }: DataSourceItemProps) {
   // const isConnected = true;
 
   const isDark = useThemeStore((state) => state.isDark);
@@ -56,7 +58,12 @@ export function DataSourceItem({ name, connector }: DataSourceItemProps) {
     <div className="border border-gray-200 dark:border-gray-700 rounded-lg p-4 bg-white dark:bg-gray-800">
       <div className="flex items-center justify-between mb-4">
         <div className="flex items-center space-x-3">
-          <img src={getTypeIcon()} alt={name} className="w-6 h-6" />
+          {icon?.startsWith("font_") ? (
+            <FontIcon name={icon} className="size-6" />
+          ) : (
+            <img src={getTypeIcon()} alt={name} className="size-6" />
+          )}
+
           <span className="font-medium text-gray-900 dark:text-white">
             {name}
           </span>

src/components/Cloud/DataSourcesList.tsx

@@ -4,16 +4,15 @@ import { RefreshCcw } from "lucide-react";
 
 import { DataSourceItem } from "./DataSourceItem";
 import { useConnectStore } from "@/stores/connectStore";
-import { useAppStore } from "@/stores/appStore";
 import {
   get_connectors_by_server,
-  get_datasources_by_server,
+  datasource_search,
 } from "@/commands";
 
 export function DataSourcesList({ server }: { server: string }) {
   const { t } = useTranslation();
   const datasourceData = useConnectStore((state) => state.datasourceData);
-  const setError = useAppStore((state) => state.setError);
+
   const [refreshLoading, setRefreshLoading] = useState(false);
   const setDatasourceData = useConnectStore((state) => state.setDatasourceData);
   const setConnectorData = useConnectStore((state) => state.setConnectorData);
@@ -25,22 +24,14 @@ export function DataSourcesList({ server }: { server: string }) {
         // console.log("get_connectors_by_server", res);
         setConnectorData(res, server);
       })
-      .catch((err: any) => {
-        setError(err);
-        throw err; // Propagate error back up
-      })
       .finally(() => {});
 
     //fetch datasource data
-    get_datasources_by_server(server)
+    datasource_search(server)
       .then((res: any) => {
-        // console.log("get_datasources_by_server", res);
+        // console.log("datasource_search", res);
         setDatasourceData(res, server);
       })
-      .catch((err: any) => {
-        setError(err);
-        throw err; // Propagate error back up
-      })
       .finally(() => {});
   }
 
@@ -48,8 +39,6 @@ export function DataSourcesList({ server }: { server: string }) {
     setRefreshLoading(true);
     try {
       initServerAppData({ server });
-    } catch (e) {
-      setError(e);
     } finally {
       setRefreshLoading(false);
     }

src/components/Cloud/Sidebar.tsx

@@ -27,7 +27,7 @@ export const Sidebar = forwardRef<{ refreshData: () => void }, SidebarProps>(
       return (
         <div
           key={item?.id}
-          className={`flex cursor-pointer items-center space-x-2 px-3 py-2 bg-blue-50 dark:bg-blue-900/20 text-blue-600 dark:text-blue-400 rounded-lg mb-2 ${
+          className={`flex cursor-pointer items-center space-x-2 px-3 py-2 bg-blue-50 dark:bg-blue-900/20 text-blue-600 dark:text-blue-400 rounded-lg mb-2 whitespace-nowrap ${
             currentService?.id === item?.id
               ? "dark:bg-blue-900/20 dark:bg-blue-900 border border-[#0087ff]"
               : "bg-gray-50 dark:bg-gray-900 border border-[#e6e6e6] dark:border-gray-700"
@@ -37,9 +37,9 @@ export const Sidebar = forwardRef<{ refreshData: () => void }, SidebarProps>(
           <img
             src={item?.provider?.icon || cocoLogoImg}
             alt="LogoImg"
-            className="w-5 h-5"
+            className="w-5 h-5 flex-shrink-0"
           />
-          <span className="font-medium">{item?.name}</span>
+          <span className="font-medium truncate max-w-[140px]">{item?.name}</span>
           <div className="flex-1" />
           <button className="text-blue-600 dark:text-blue-400 hover:text-blue-700 dark:hover:text-blue-300">
             {item.health?.status ? (

src/components/Common/Copyright/index.tsx

@@ -0,0 +1,24 @@
+import { useThemeStore } from "@/stores/themeStore";
+import logoLight from "@/assets/images/logo-light.png";
+import logoDark from "@/assets/images/logo-dark.png";
+
+const Copyright = () => {
+  const isDark = useThemeStore((state) => state.isDark);
+
+  const renderLogo = () => {
+    return (
+      <a href="https://coco.rs/" target="_blank">
+        <img src={isDark ? logoDark : logoLight} alt="Logo" className="h-4" />
+      </a>
+    );
+  };
+
+  return (
+    <div className="flex items-center gap-[6px] text-xs text-[#666] dark:text-[#999]">
+      Powered by
+      {renderLogo()}
+    </div>
+  );
+};
+
+export default Copyright;

src/components/Common/ErrorNotification/ErrorSearch.tsx

@@ -0,0 +1,44 @@
+import { useState } from "react";
+import { CircleAlert, Bolt, X, Ellipsis } from "lucide-react";
+import { useTranslation } from "react-i18next";
+
+import platformAdapter from "@/utils/platformAdapter";
+import Tooltip from "@/components/Common/Tooltip";
+
+interface ErrorSearchProps {
+  isError: any[];
+}
+
+const ErrorSearch = ({
+  isError,
+}: ErrorSearchProps) => {
+  const { t } = useTranslation();
+
+  const [showError, setShowError] = useState<boolean>(isError?.length > 0);
+
+  if (!showError) return null;
+
+  return (
+    <div className="flex items-center gap-2 text-sm text-[#333] dark:text-[#666] p-2">
+      <CircleAlert className="text-[#FF0000] size-3" />
+      {t("search.list.failures")}
+
+      <Tooltip content={isError} position="bottom">
+        <Ellipsis className="dark:text-white size-3 cursor-pointer" />
+      </Tooltip>
+
+      <Bolt
+        className="dark:text-white size-3 cursor-pointer"
+        onClick={() => {
+          platformAdapter.emitEvent("open_settings", "connect");
+        }}
+      />
+      <X
+        className="text-[#666] size-4 cursor-pointer"
+        onClick={() => setShowError(false)}
+      />
+    </div>
+  );
+};
+
+export default ErrorSearch;

src/components/Common/ErrorNotification/index.tsx

@@ -0,0 +1,74 @@
+import { useEffect } from "react";
+import { X, AlertCircle, AlertTriangle, Info } from "lucide-react";
+
+import { useAppStore } from "@/stores/appStore";
+
+interface ErrorNotificationProps {
+  duration?: number;
+  autoClose?: boolean;
+}
+
+const ErrorNotification = ({
+  duration = 3000,
+  autoClose = true
+ }: ErrorNotificationProps) => {
+  const errors = useAppStore((state) => state.errors);
+  const removeError = useAppStore((state) => state.removeError);
+
+  useEffect(() => {
+    if (!autoClose) return;
+
+    const timer = setInterval(() => {
+      const now = Date.now();
+      errors.forEach((error) => {
+        if (now - error.timestamp > duration) {
+          removeError(error.id);
+        }
+      });
+    }, 1000);
+
+    return () => clearInterval(timer);
+  }, [errors, duration, autoClose]);
+
+  if (errors.length === 0) return null;
+
+  return (
+    <div className="fixed bottom-10 right-4 z-50 max-w-[calc(100%-32px)] space-y-2">
+      {errors.map((error) => (
+        <div
+          key={error.id}
+          className={`flex justify-between gap-4 items-center p-4 rounded-lg shadow-lg ${
+            error.type === "error"
+              ? "bg-red-50 dark:bg-red-900"
+              : error.type === "warning"
+              ? "bg-yellow-50 dark:bg-yellow-900"
+              : "bg-blue-50 dark:bg-blue-900"
+          }`}
+        >
+          <div className="flex">
+            {error.type === "error" && (
+              <AlertCircle className="w-5 h-5 text-red-500 mr-2" />
+            )}
+            {error.type === "warning" && (
+              <AlertTriangle className="w-5 h-5 text-yellow-500 mr-2" />
+            )}
+            {error.type === "info" && (
+              <Info className="w-5 h-5 text-blue-500 mr-2" />
+            )}
+
+            <span className="text-sm text-gray-700 dark:text-gray-200">
+              {error.message}
+            </span>
+          </div>
+
+          <X
+            className="w-5 h-5 ml-4 cursor-pointer text-gray-400 hover:text-gray-600"
+            onClick={() => removeError(error.id)}
+          />
+        </div>
+      ))}
+    </div>
+  );
+};
+
+export default ErrorNotification;

src/components/Common/HistoryList/index.tsx

@@ -0,0 +1,426 @@
+import { useKeyPress } from "ahooks";
+import {
+  Description,
+  Dialog,
+  DialogPanel,
+  DialogTitle,
+  Input,
+  Popover,
+  PopoverButton,
+  PopoverPanel,
+} from "@headlessui/react";
+import { debounce, groupBy, isNil } from "lodash-es";
+import { FC, useEffect, useMemo, useRef, useState } from "react";
+import dayjs from "dayjs";
+import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
+import clsx from "clsx";
+import {
+  Ellipsis,
+  PanelLeftClose,
+  Pencil,
+  RefreshCcw,
+  Search,
+  Trash2,
+} from "lucide-react";
+import { useTranslation } from "react-i18next";
+
+import VisibleKey from "../VisibleKey";
+import { Chat } from "@/components/Assistant/types";
+import NoDataImage from "../NoDataImage";
+import { closeHistoryPanel } from "@/utils";
+
+dayjs.extend(isSameOrAfter);
+
+interface HistoryListProps {
+  id?: string;
+  list: Chat[];
+  active?: Chat;
+  onSearch: (keyword: string) => void;
+  onRefresh: () => void;
+  onSelect: (chat: Chat) => void;
+  onRename: (chatId: string, title: string) => void;
+  onRemove: (chatId: string) => void;
+}
+
+const HistoryList: FC<HistoryListProps> = (props) => {
+  const {
+    id,
+    list,
+    active,
+    onSearch,
+    onRefresh,
+    onSelect,
+    onRename,
+    onRemove,
+  } = props;
+  const { t } = useTranslation();
+  const [isEdit, setIsEdit] = useState(false);
+  const [isOpen, setIsOpen] = useState(false);
+  const listRef = useRef<HTMLDivElement>(null);
+  const searchInputRef = useRef<HTMLInputElement>(null);
+  const moreButtonRef = useRef<HTMLButtonElement>(null);
+  const [isRefresh, setIsRefresh] = useState(false);
+
+  const sortedList = useMemo(() => {
+    if (isNil(list)) return {};
+
+    const now = dayjs();
+
+    return groupBy(list, (chat) => {
+      const date = dayjs(chat._source?.updated);
+
+      if (date.isSame(now, "day")) {
+        return "history_list.date.today";
+      }
+
+      if (date.isSame(now.subtract(1, "day"), "day")) {
+        return "history_list.date.yesterday";
+      }
+
+      if (date.isSameOrAfter(now.subtract(7, "day"), "day")) {
+        return "history_list.date.last7Days";
+      }
+
+      if (date.isSameOrAfter(now.subtract(30, "day"), "day")) {
+        return "history_list.date.last30Days";
+      }
+
+      return date.format("YYYY-MM");
+    });
+  }, [list]);
+
+  const menuItems = [
+    // {
+    //   label: "history_list.menu.share",
+    //   icon: Share2,
+    //   onClick: () => {},
+    // },
+    {
+      label: "history_list.menu.rename",
+      icon: Pencil,
+      shortcut: "R",
+      onClick: () => {
+        setIsEdit(true);
+      },
+    },
+    {
+      label: "history_list.menu.delete",
+      icon: Trash2,
+      shortcut: "D",
+      iconColor: "#FF2018",
+      onClick: () => {
+        setIsOpen(true);
+      },
+    },
+  ];
+
+  const debouncedSearch = useMemo(() => {
+    return debounce((value: string) => onSearch(value), 300);
+  }, [onSearch]);
+
+  useKeyPress(["uparrow", "downarrow"], (_, key) => {
+    const index = list.findIndex((item) => item._id === active?._id);
+    const length = list.length;
+
+    let nextIndex = index;
+
+    switch (key) {
+      case "uparrow":
+        nextIndex = index === 0 ? length - 1 : index - 1;
+        break;
+      case "downarrow":
+        nextIndex = index === length - 1 ? 0 : index + 1;
+        break;
+    }
+
+    onSelect(list[nextIndex]);
+  });
+
+  useEffect(() => {
+    if (!active?._id || !listRef.current) return;
+
+    const activeEl = listRef.current.querySelector(`#${active._id}`);
+
+    activeEl?.scrollIntoView({ behavior: "smooth", block: "center" });
+  }, [active?._id]);
+
+  const handleRemove = () => {
+    if (!active?._id) return;
+
+    onRemove(active._id);
+
+    setIsOpen(false);
+  };
+
+  const handleRefresh = async () => {
+    setIsRefresh(true);
+
+    await onRefresh();
+
+    setTimeout(() => {
+      setIsRefresh(false);
+    }, 1000);
+  };
+
+  return (
+    <div
+      ref={listRef}
+      id={id}
+      className={clsx(
+        "flex flex-col h-screen text-sm bg-[#F3F4F6] dark:bg-[#1F2937]"
+      )}
+    >
+      <div className="flex gap-1 p-2 border-b dark:border-[#343D4D]">
+        <div className="flex-1 flex items-center gap-2 px-2 rounded-lg border transition border-[#E6E6E6] bg-[#F8F9FA] dark:bg-[#2B3444] dark:border-[#343D4D] focus-within:border-[#0061FF]">
+          <VisibleKey
+            shortcut="F"
+            onKeyPress={() => {
+              searchInputRef.current?.focus();
+            }}
+          >
+            <Search className="size-4 text-[#6B7280]" />
+          </VisibleKey>
+
+          <Input
+            autoFocus
+            ref={searchInputRef}
+            className="w-full bg-transparent outline-none"
+            placeholder={t("history_list.search.placeholder")}
+            onChange={(event) => {
+              debouncedSearch(event.target.value);
+            }}
+          />
+        </div>
+
+        <div
+          className="size-8 flex items-center justify-center rounded-lg border text-[#0072FF] border-[#E6E6E6] bg-[#F3F4F6] dark:border-[#343D4D] dark:bg-[#1F2937] hover:bg-[#F8F9FA] dark:hover:bg-[#353F4D] cursor-pointer transition"
+          onClick={handleRefresh}
+        >
+          <VisibleKey shortcut="R" onKeyPress={handleRefresh}>
+            <RefreshCcw
+              className={clsx("size-4", {
+                "animate-spin": isRefresh,
+              })}
+            />
+          </VisibleKey>
+        </div>
+      </div>
+
+      <div className="flex-1 px-2 overflow-auto custom-scrollbar">
+        {list.length > 0 ? (
+          <>
+            <div className="mt-6">
+              {Object.entries(sortedList).map(([label, list]) => {
+                return (
+                  <div key={label}>
+                    <span className="text-xs text-[#999] px-3">{t(label)}</span>
+
+                    <ul className="p-0">
+                      {list.map((item) => {
+                        const { _id, _source } = item;
+
+                        const isActive = _id === active?._id;
+                        const title = _source?.title ?? _id;
+
+                        return (
+                          <li
+                            key={_id}
+                            id={_id}
+                            className={clsx(
+                              "flex items-center mt-1 h-10 rounded-lg cursor-pointer hover:bg-[#EDEDED] dark:hover:bg-[#353F4D] transition",
+                              {
+                                "!bg-[#E5E7EB] dark:!bg-[#2B3444]": isActive,
+                              }
+                            )}
+                            onClick={() => {
+                              if (!isActive) {
+                                setIsEdit(false);
+                              }
+
+                              onSelect(item);
+                            }}
+                          >
+                            <div
+                              className={clsx(
+                                "w-1 h-6 rounded-sm bg-[#0072FF]",
+                                {
+                                  "opacity-0": _id !== active?._id,
+                                }
+                              )}
+                            />
+
+                            <div className="flex-1 flex items-center justify-between gap-2 px-2 overflow-hidden">
+                              {isEdit && isActive ? (
+                                <Input
+                                  autoFocus
+                                  defaultValue={title}
+                                  className="flex-1 -mx-px outline-none bg-transparent border border-[#0061FF] rounded-[4px]"
+                                  onKeyDown={(event) => {
+                                    if (event.key !== "Enter") return;
+
+                                    onRename(
+                                      item._id,
+                                      event.currentTarget.value
+                                    );
+
+                                    setIsEdit(false);
+                                  }}
+                                  onBlur={(event) => {
+                                    onRename(item._id, event.target.value);
+
+                                    setIsEdit(false);
+                                  }}
+                                />
+                              ) : (
+                                <span className="truncate">{title}</span>
+                              )}
+
+                              <div className="flex items-center gap-2">
+                                {isActive && !isEdit && (
+                                  <VisibleKey
+                                    shortcut="↑↓"
+                                    rootClassName="w-6"
+                                    shortcutClassName="w-6"
+                                  />
+                                )}
+
+                                <Popover>
+                                  {isActive && !isEdit && (
+                                    <PopoverButton
+                                      ref={moreButtonRef}
+                                      className="flex gap-2"
+                                    >
+                                      <VisibleKey
+                                        shortcut="O"
+                                        onKeyPress={() => {
+                                          moreButtonRef.current?.click();
+                                        }}
+                                      >
+                                        <Ellipsis className="size-4 text-[#979797]" />
+                                      </VisibleKey>
+                                    </PopoverButton>
+                                  )}
+
+                                  <PopoverPanel
+                                    anchor="bottom"
+                                    className="flex flex-col rounded-lg shadow-md z-100 bg-white dark:bg-[#202126] p-1 border border-black/2 dark:border-white/10"
+                                    onClick={(event) => {
+                                      event.stopPropagation();
+                                    }}
+                                  >
+                                    {menuItems.map((menuItem) => {
+                                      const {
+                                        label,
+                                        icon: Icon,
+                                        shortcut,
+                                        iconColor,
+                                        onClick,
+                                      } = menuItem;
+
+                                      return (
+                                        <button
+                                          key={label}
+                                          className="flex items-center gap-2 px-3 py-2 text-sm rounded-md hover:bg-[#EDEDED] dark:hover:bg-[#2B2C31] transition"
+                                          onClick={onClick}
+                                        >
+                                          <VisibleKey
+                                            shortcut={shortcut}
+                                            onKeyPress={onClick}
+                                          >
+                                            <Icon
+                                              className="size-4"
+                                              style={{
+                                                color: iconColor,
+                                              }}
+                                            />
+                                          </VisibleKey>
+
+                                          <span>{t(label)}</span>
+                                        </button>
+                                      );
+                                    })}
+                                  </PopoverPanel>
+                                </Popover>
+                              </div>
+                            </div>
+                          </li>
+                        );
+                      })}
+                    </ul>
+                  </div>
+                );
+              })}
+            </div>
+
+            <Dialog
+              open={isOpen}
+              onClose={() => setIsOpen(false)}
+              className="relative z-1000"
+            >
+              <div
+                id="headlessui-popover-panel:delete-history"
+                className="fixed inset-0 flex items-center justify-center w-screen"
+              >
+                <DialogPanel className="flex flex-col justify-between w-[360px] h-[160px] p-3 text-[#333] dark:text-white/90 border border-[#e6e6e6] bg-white dark:bg-[#202126] dark:border-white/10 shadow-xl rounded-lg">
+                  <div className="flex flex-col gap-3">
+                    <DialogTitle className="text-base font-bold">
+                      {t("history_list.delete_modal.title")}
+                    </DialogTitle>
+                    <Description className="text-sm">
+                      {t("history_list.delete_modal.description", {
+                        replace: [active?._source?.title || active?._source?.message || active?._id],
+                      })}
+                    </Description>
+                  </div>
+
+                  <div className="flex gap-4 self-end">
+                    <VisibleKey
+                      shortcut="N"
+                      shortcutClassName="left-[unset] right-0"
+                      onKeyPress={() => setIsOpen(false)}
+                    >
+                      <button
+                        className="h-8 px-4 text-sm text-[#666666] bg-[#F8F9FA] dark:text-white dark:bg-[#202126] border border-[#E6E6E6] dark:border-white/10 rounded-lg"
+                        onClick={() => setIsOpen(false)}
+                      >
+                        {t("history_list.delete_modal.button.cancel")}
+                      </button>
+                    </VisibleKey>
+
+                    <VisibleKey
+                      shortcut="Y"
+                      shortcutClassName="left-[unset] right-0"
+                      onKeyPress={handleRemove}
+                    >
+                      <button
+                        className="h-8 px-4 text-sm text-white bg-[#EF4444] rounded-lg"
+                        onClick={handleRemove}
+                      >
+                        {t("history_list.delete_modal.button.delete")}
+                      </button>
+                    </VisibleKey>
+                  </div>
+                </DialogPanel>
+              </div>
+            </Dialog>
+          </>
+        ) : (
+          <div className="flex items-center justify-center flex-1 pt-8">
+            <NoDataImage />
+          </div>
+        )}
+      </div>
+
+      <div className="flex justify-end p-2 border-t dark:border-[#343D4D]">
+        <VisibleKey shortcut="Esc" shortcutClassName="w-7">
+          <PanelLeftClose
+            className="size-4 text-black/80 dark:text-white/80 cursor-pointer"
+            onClick={closeHistoryPanel}
+          />
+        </VisibleKey>
+      </div>
+    </div>
+  );
+};
+
+export default HistoryList;

src/components/Common/Icons/FontIcon.tsx

@@ -0,0 +1,27 @@
+import { useIconfontScript } from "@/hooks/useScript";
+import { useAppStore } from "@/stores/appStore";
+import logoImg from "@/assets/icon.svg";
+
+interface FontIconProps {
+  name: string;
+  className?: string;
+  style?: React.CSSProperties;
+}
+
+const FontIcon = ({ name, className, style, ...rest }: FontIconProps) => {
+  useIconfontScript();
+
+  const isTauri = useAppStore((state) => state.isTauri);
+
+  if (isTauri) {
+    return (
+      <svg className={`icon ${className || ""}`} style={style} {...rest}>
+        <use xlinkHref={`#${name}`} />
+      </svg>
+    );
+  } else {
+    return <img src={logoImg} className={className} alt={"coco"} />;
+  }
+};
+
+export default FontIcon;

src/components/Common/Icons/ItemIcon.tsx

@@ -1,9 +1,14 @@
 import { File } from "lucide-react";
+import React, { useState } from "react";
+import { useAsyncEffect } from "ahooks";
+import { isEmpty, isNil } from "lodash-es";
 
 import IconWrapper from "./IconWrapper";
 import ThemedIcon from "./ThemedIcon";
 import { useFindConnectorIcon } from "@/hooks/useFindConnectorIcon";
 import { useAppStore } from "@/stores/appStore";
+import FontIcon from "./FontIcon";
+import platformAdapter from "@/utils/platformAdapter";
 
 interface ItemIconProps {
   item: any;
@@ -11,60 +16,94 @@ interface ItemIconProps {
   onClick?: React.MouseEventHandler<HTMLDivElement>;
 }
 
-function ItemIcon({
+const ItemIcon = React.memo(function ItemIcon({
   item,
   className = "w-5 h-5 flex-shrink-0",
   onClick = () => {},
 }: ItemIconProps) {
   const endpoint_http = useAppStore((state) => state.endpoint_http);
-
   const connectorSource = useFindConnectorIcon(item);
-  // console.log("connectorSource", connectorSource);
   const icons = connectorSource?.assets?.icons || {};
+  const [isAbsolute, setIsAbsolute] = useState<boolean>();
 
-  // If the icon is a valid base64-encoded image
-  const isBase64 = item?.icon?.startsWith("data:image/");
-  if (isBase64) {
-    return (
-      <IconWrapper className={className} onClick={onClick}>
-        <img className={className} src={item?.icon} alt="icon" />
-      </IconWrapper>
-    );
-  }
+  useAsyncEffect(async () => {
+    if (isEmpty(item)) return;
 
-  let selectedIcon = icons[item?.icon];
-  if (!selectedIcon) {
-    selectedIcon=item?.icon
-  }
+    try {
+      const { isAbsolute } = await platformAdapter.metadata(item.icon, {
+        omitSize: true,
+      });
+      setIsAbsolute(Boolean(isAbsolute));
+    } catch (error) {
+      setIsAbsolute(false);
+    }
+  }, [item]);
 
-  if (!selectedIcon) {
-    return (
-      <IconWrapper className={className} onClick={onClick}>
-        <ThemedIcon component={File} className={className} />
-      </IconWrapper>
-    );
-  }
+  const renderIcon = () => {
+    if (isNil(isAbsolute)) return;
 
-  if (
-    selectedIcon.startsWith("http://") ||
-    selectedIcon.startsWith("https://")
-  ) {
-    return (
-      <IconWrapper className={className} onClick={onClick}>
-        <img className={className} src={selectedIcon} alt="icon" />
-      </IconWrapper>
-    );
-  } else {
-    return (
-      <IconWrapper className={className} onClick={onClick}>
-        <img
-          className={className}
-          src={`${endpoint_http}${selectedIcon}`}
-          alt="icon"
-        />
-      </IconWrapper>
-    );
-  }
-}
+    if (isAbsolute) {
+      return (
+        <IconWrapper className={className} onClick={onClick}>
+          <img
+            className={className}
+            src={platformAdapter.convertFileSrc(item?.icon)}
+            alt="icon"
+          />
+        </IconWrapper>
+      );
+    } else {
+      if (item?.icon?.startsWith("font_")) {
+        return <FontIcon name={item?.icon} className={className} />;
+      }
+
+      // If the icon is a valid base64-encoded image
+      const isBase64 = item?.icon?.startsWith("data:image/");
+      if (isBase64) {
+        return (
+          <IconWrapper className={className} onClick={onClick}>
+            <img className={className} src={item?.icon} alt="icon" />
+          </IconWrapper>
+        );
+      }
+
+      let selectedIcon = icons[item?.icon];
+      if (!selectedIcon) {
+        selectedIcon = item?.icon;
+      }
+
+      if (!selectedIcon) {
+        return (
+          <IconWrapper className={className} onClick={onClick}>
+            <ThemedIcon component={File} className={className} />
+          </IconWrapper>
+        );
+      }
+
+      if (
+        selectedIcon.startsWith("http://") ||
+        selectedIcon.startsWith("https://")
+      ) {
+        return (
+          <IconWrapper className={className} onClick={onClick}>
+            <img className={className} src={selectedIcon} alt="icon" />
+          </IconWrapper>
+        );
+      } else {
+        return (
+          <IconWrapper className={className} onClick={onClick}>
+            <img
+              className={className}
+              src={`${endpoint_http}${selectedIcon}`}
+              alt="icon"
+            />
+          </IconWrapper>
+        );
+      }
+    }
+  };
+
+  return renderIcon();
+});
 
 export default ItemIcon;

src/components/Common/Icons/TypeIcon.tsx

@@ -20,6 +20,29 @@ function TypeIcon({
   const endpoint_http = useAppStore((state) => state.endpoint_http);
   const connectorSource = useFindConnectorIcon(item);
 
+  const isCalculator = item.id === "Calculator";
+
+  if (isCalculator) {
+    return (
+      <IconWrapper className={className} onClick={onClick}>
+        <img className={className} src="/assets/calculator.png" alt="icon" />
+      </IconWrapper>
+    );
+  }
+
+  if (item?.source?.icon) {
+    if (
+      item?.source?.icon.startsWith("http://") ||
+      item?.source?.icon.startsWith("https://")
+    ) {
+      return (
+        <IconWrapper className={className} onClick={onClick}>
+          <img className={className} src={item?.source?.icon} alt="icon" />
+        </IconWrapper>
+      );
+    }
+  }
+
   // If the icon is a valid base64-encoded image
   const isBase64 = connectorSource?.icon?.startsWith("data:image/");
   if (isBase64) {

src/components/Common/NoDataImage.tsx

@@ -0,0 +1,132 @@
+import { useThemeStore } from "@/stores/themeStore";
+import { FC, useMemo } from "react";
+
+interface NoDataImageProps {
+  size?: number;
+}
+
+const NoDataImage: FC<NoDataImageProps> = (props) => {
+  const { size = 64 } = props;
+  const isDark = useThemeStore((state) => state.isDark);
+
+  const color = useMemo(() => {
+    return isDark ? "#666" : "#bbb";
+  }, [isDark]);
+
+  return (
+    <svg
+      width={size}
+      height={size}
+      viewBox="0 0 64 64"
+      version="1.1"
+      xmlns="http://www.w3.org/2000/svg"
+      xmlnsXlink="http://www.w3.org/1999/xlink"
+    >
+      <title>编组</title>
+      <defs>
+        <rect id="path-1" x="0" y="0" width="64" height="64"></rect>
+      </defs>
+      <g
+        id="聊天记录"
+        stroke="none"
+        strokeWidth="1"
+        fill="none"
+        fillRule="evenodd"
+      >
+        <g id="画板" transform="translate(-1164, -252)">
+          <g id="编组" transform="translate(1164, 252)">
+            <mask id="mask-2" fill="white">
+              <use xlinkHref="#path-1"></use>
+            </mask>
+            <g id="矩形"></g>
+            <path
+              d="M42.6791711,10.4781665 C43.2314559,10.4781665 43.6791711,10.9258817 43.6791711,11.4781665 C43.6791711,12.0304512 43.2314559,12.4781665 42.6791711,12.4781665 L22.9821691,12.4781665 C20.8942749,12.4781665 19.1821691,14.272673 19.1821691,16.5091825 L19.1821691,52.5647975 C19.1821691,54.801307 20.8942749,56.5958135 22.9821691,56.5958135 L52.5821691,56.5958135 C54.6700634,56.5958135 56.3821691,54.801307 56.3821691,52.5647975 L56.3821691,35.1361358 C56.3821691,34.5838511 56.8298844,34.1361358 57.3821691,34.1361358 C57.9344539,34.1361358 58.3821691,34.5838511 58.3821691,35.1361358 L58.3821691,52.5647975 C58.3821691,55.8853949 55.7962085,58.5958135 52.5821691,58.5958135 L22.9821691,58.5958135 C19.7681298,58.5958135 17.1821691,55.8853949 17.1821691,52.5647975 L17.1821691,16.5091825 C17.1821691,13.1885852 19.7681298,10.4781665 22.9821691,10.4781665 L42.6791711,10.4781665 Z"
+              id="路径"
+              fill={color}
+              fillRule="nonzero"
+              mask="url(#mask-2)"
+              transform="translate(37.7822, 34.537) scale(-1, -1) translate(-37.7822, -34.537)"
+            ></path>
+            <path
+              d="M13.0320895,0.82004591 C13.5510674,0.631153401 14.1249097,0.898740484 14.3138023,1.41771839 L15.8235355,5.56567639 C16.012428,6.0846543 15.7448409,6.65849665 15.225863,6.84738916 C14.7068851,7.03628167 14.1330428,6.76869458 13.9441503,6.24971668 L12.434417,2.10175867 C12.2455245,1.58278077 12.5131116,1.00893842 13.0320895,0.82004591 Z"
+              id="路径-4"
+              fill={color}
+              fillRule="nonzero"
+              mask="url(#mask-2)"
+            ></path>
+            <path
+              d="M21.302281,2.6499257 C21.6572828,2.22685104 22.2880384,2.17166708 22.7111131,2.52666887 C23.1341877,2.88167066 23.1893717,3.51242626 22.8343699,3.93550092 L19.9969995,7.31694727 C19.6419977,7.74002193 19.0112421,7.7952059 18.5881675,7.4402041 C18.1650928,7.08520231 18.1099088,6.45444672 18.4649106,6.03137205 L21.302281,2.6499257 Z"
+              id="路径-4"
+              fill={color}
+              fillRule="nonzero"
+              mask="url(#mask-2)"
+            ></path>
+            <path
+              d="M12.7902454,12.7943281 C13.1452472,12.3712534 13.7760028,12.3160695 14.1990774,12.6710713 C14.6221521,13.0260731 14.677336,13.6568287 14.3223342,14.0799033 L11.4849639,17.4613497 C11.1299621,17.8844243 10.4992065,17.9396083 10.0761318,17.5846065 C9.65305715,17.2296047 9.59787319,16.5988491 9.95287498,16.1757745 L12.7902454,12.7943281 Z"
+              id="路径-4"
+              fill={color}
+              fillRule="nonzero"
+              mask="url(#mask-2)"
+            ></path>
+            <path
+              d="M7.75703715,7.52422963 L7.8730548,7.53785515 L12.2201584,8.30436681 C12.7640527,8.40027005 13.1272212,8.91892844 13.031318,9.46282274 C12.9354148,10.006717 12.4167564,10.3698856 11.8728621,10.2739823 L7.52575844,9.50747066 C6.98186414,9.41156742 6.61869562,8.89290903 6.71459887,8.34901473 C6.81050211,7.80512042 7.32916049,7.44195191 7.8730548,7.53785515 L7.75703715,7.52422963 Z"
+              id="路径-4"
+              fill={color}
+              fillRule="nonzero"
+              mask="url(#mask-2)"
+            ></path>
+            <g id="编组-7" mask="url(#mask-2)" fill={color} fillRule="nonzero">
+              <g transform="translate(21.7188, 46.9969) rotate(18) translate(-21.7188, -46.9969)translate(1.0617, 26.0967)">
+                <path
+                  d="M29.4293481,8.47638559 C29.6966411,8.47287826 29.9542113,8.57653439 30.1445628,8.76421534 L34.821948,13.37598 C35.2152213,13.7637359 35.219694,14.3968851 34.8319381,14.7901583 C34.4441822,15.1834316 33.811033,15.1879043 33.4177598,14.8001484 L29.0372657,10.4802995 L10.8832657,10.7192995 L7.15822377,14.4638747 C6.79868609,14.8253024 6.23152968,14.8545189 5.83844017,14.5505235 L5.74401507,14.4675822 C5.35246833,14.078083 5.35080843,13.4449202 5.74030758,13.0533735 L9.75247731,9.02011185 C9.93695686,8.8346625 10.1867572,8.72888061 10.4483149,8.72544853 L29.4293481,8.47638559 Z"
+                  id="路径"
+                ></path>
+                <path
+                  d="M21.9935139,5.99478408 C22.1098028,5.454881 22.6417515,5.11147388 23.1816546,5.22776279 C30.6189355,6.82966762 36.013841,13.4326353 36.013841,21.1370431 C36.013841,30.1250238 28.7276429,37.4112219 19.7396622,37.4112219 C13.7007194,37.4112219 8.24610098,34.0926516 5.42139758,28.8785984 C5.15832308,28.3929954 5.33871807,27.7860724 5.82432105,27.5229979 C6.30992403,27.2599235 6.91684704,27.4403184 7.17992153,27.9259214 C9.65840757,32.5009002 14.442002,35.4112219 19.7396622,35.4112219 C27.6230734,35.4112219 34.013841,29.0204543 34.013841,21.1370431 C34.013841,14.3797233 29.2812816,8.58741864 22.7605351,7.18292479 C22.2206321,7.06663587 21.8772249,6.53468716 21.9935139,5.99478408 Z"
+                  id="路径"
+                  transform="translate(20.6572, 21.3082) rotate(54) translate(-20.6572, -21.3082)"
+                ></path>
+                <path
+                  d="M24.8408727,10.2022416 C25.1806942,9.48260473 26.1841494,9.42898516 26.5987243,10.1083109 C28.1725233,12.6871503 30.5237061,13.5670326 33.8949611,12.7889293 L34.3447467,14.7376963 C30.8069102,15.5542475 27.9486137,14.8138981 25.9168841,12.5414695 L25.7964185,12.4022407 L25.7898204,12.4127995 C25.6463328,12.5945684 25.4927076,12.7728669 25.3285985,12.9461789 L25.0745286,13.2022175 C23.8489955,14.3805113 22.3059749,15.0880642 20.4542955,15.0880642 C18.3100422,15.0880642 16.4792823,14.2999241 15.006077,12.7631502 L14.8394185,12.5842407 L14.8279264,12.601442 C13.2192845,14.7385979 10.485016,15.3662742 6.82944359,14.516796 L6.52268429,14.4425875 L7.01015268,12.5029033 C10.675886,13.4241508 12.8140347,12.7029257 13.7976491,10.3982465 C14.1109032,9.66426959 15.1154408,9.57488536 15.5533666,10.2420219 C16.8166654,12.1665323 18.4200295,13.0880642 20.4542955,13.0880642 C21.7518359,13.0880642 22.8143045,12.6008686 23.6883743,11.7604906 C24.2529251,11.217701 24.6339476,10.6404451 24.8408727,10.2022416 Z"
+                  id="路径-16"
+                ></path>
+                <path
+                  d="M12.8244173,23.0152776 C13.1494608,21.9675928 14.6803967,22.1318925 14.7757241,23.2246913 C15.2805735,29.0121052 16.9225833,32.5211991 19.5882786,33.8687679 C22.99019,35.5885105 25.2983354,32.9466769 25.9867311,26.7356659 C26.1186972,25.5450097 27.8517173,25.5511021 27.9753088,26.7426567 C28.3760471,30.6062039 28.258208,33.1868933 27.5394161,34.6115345 C27.2906367,35.1046138 26.6892413,35.302658 26.196162,35.0538786 C25.8791824,34.8939489 25.6841306,34.5882954 25.6513323,34.2593739 L25.6474421,34.1795936 L25.5912925,34.2588436 C23.9966984,36.4166078 21.7167087,37.0904273 18.9087496,35.7626542 L18.6859746,35.6536621 C16.4357028,34.5160993 14.8302856,32.3368304 13.837234,29.149295 L13.7894421,28.9905936 L13.7871985,29.0725484 C13.7433455,31.0241936 14.0745615,32.6398281 14.6834347,33.7216018 L14.7874678,33.8969203 C15.0804319,34.3650982 14.938393,34.9821256 14.4702152,35.2750897 C14.0020373,35.5680537 13.3850099,35.4260149 13.0920458,34.957837 C11.5454425,32.4862525 11.2726605,28.0169212 12.8244173,23.0152776 Z"
+                  id="路径-17"
+                ></path>
+                <path
+                  d="M34.9080784,-0.312138826 C35.4592592,-0.347040678 35.9343731,0.0714861262 35.9692749,0.622666955 C36.0041768,1.17384778 35.58565,1.64896167 35.0344692,1.68386352 L26.467279,2.22586235 L24.1964917,8.55308868 C24.0232482,9.03577628 23.5171178,9.30318989 23.0295024,9.18955089 L22.9174644,9.1564868 C22.397647,8.96991696 22.1274965,8.39727695 22.3140663,7.87745954 L24.8068618,0.932078859 C24.9416364,0.556572435 25.2867164,0.297104704 25.6848791,0.271892256 L34.9080784,-0.312138826 Z"
+                  id="路径-20"
+                  transform="translate(29.1132, 4.4507) rotate(-7) translate(-29.1132, -4.4507)"
+                ></path>
+              </g>
+            </g>
+            <path
+              d="M49.865098,19.7058824 C50.4173828,19.7058824 50.865098,20.1535976 50.865098,20.7058824 C50.865098,21.2581671 50.4173828,21.7058824 49.865098,21.7058824 L26.0259167,21.7058824 C25.4736319,21.7058824 25.0259167,21.2581671 25.0259167,20.7058824 C25.0259167,20.1535976 25.4736319,19.7058824 26.0259167,19.7058824 L49.865098,19.7058824 Z"
+              id="路径-7"
+              fill={color}
+              fillRule="nonzero"
+              mask="url(#mask-2)"
+            ></path>
+            <path
+              d="M49.865098,39.4705882 C50.4173828,39.4705882 50.865098,39.9183035 50.865098,40.4705882 C50.865098,41.022873 50.4173828,41.4705882 49.865098,41.4705882 L43.2941176,41.4705882 C42.7418329,41.4705882 42.2941176,41.022873 42.2941176,40.4705882 C42.2941176,39.9183035 42.7418329,39.4705882 43.2941176,39.4705882 L49.865098,39.4705882 Z"
+              id="路径-7备份"
+              fill={color}
+              fillRule="nonzero"
+              mask="url(#mask-2)"
+            ></path>
+            <path
+              d="M49.865098,47 C50.4173828,47 50.865098,47.4477153 50.865098,48 C50.865098,48.5522847 50.4173828,49 49.865098,49 L43.2941176,49 C42.7418329,49 42.2941176,48.5522847 42.2941176,48 C42.2941176,47.4477153 42.7418329,47 43.2941176,47 L49.865098,47 Z"
+              id="路径-7备份-2"
+              fill={color}
+              fillRule="nonzero"
+              mask="url(#mask-2)"
+            ></path>
+          </g>
+        </g>
+      </g>
+    </svg>
+  );
+};
+
+export default NoDataImage;

src/components/Common/PopoverInput.tsx

@@ -0,0 +1,34 @@
+import { POPOVER_PANEL_SELECTOR } from "@/constants";
+import { Input, InputProps } from "@headlessui/react";
+import { useKeyPress } from "ahooks";
+import { forwardRef, useImperativeHandle, useRef } from "react";
+
+const PopoverInput = forwardRef<HTMLInputElement, InputProps>((props, ref) => {
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  useImperativeHandle(ref, () => inputRef.current!);
+
+  useKeyPress(
+    "esc",
+    (event) => {
+      if (inputRef.current === document.activeElement) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        inputRef.current?.blur();
+
+        const parentPanel = inputRef.current?.closest(POPOVER_PANEL_SELECTOR);
+        if (parentPanel instanceof HTMLElement) {
+          parentPanel.focus();
+        }
+      }
+    },
+    {
+      target: inputRef,
+    }
+  );
+
+  return <Input ref={inputRef} {...props} />;
+});
+
+export default PopoverInput;

src/components/Common/Tooltip/index.tsx

@@ -1,8 +1,9 @@
 import React, { useState } from "react";
+
 import "./style.css";
 
 interface TooltipProps {
-  content: string;
+  content: string | any[];
   position?: "top" | "bottom" | "left" | "right";
   children: React.ReactNode;
 }
@@ -17,6 +18,21 @@ const Tooltip: React.FC<TooltipProps> = ({
   const handleMouseEnter = () => setVisible(true);
   const handleMouseLeave = () => setVisible(false);
 
+  const renderContent = () => {
+    if (Array.isArray(content)) {
+      return (
+        <ul className="list-none p-0 m-0">
+          {content.map((item, index) => (
+            <li key={index} className="py-1">
+              {item?.error || item}
+            </li>
+          ))}
+        </ul>
+      );
+    }
+    return content;
+  };
+
   return (
     <div
       className="tooltip-container"
@@ -25,7 +41,9 @@ const Tooltip: React.FC<TooltipProps> = ({
     >
       {children}
       {visible && (
-        <div className={`tooltip-box tooltip-${position}`}>{content}</div>
+        <div className={`tooltip-box tooltip-${position}`}>
+          {renderContent()}
+        </div>
       )}
     </div>
   );