93 Commits

Author SHA1 Message Date
medcl
8c9a2ff441 v0.5.0 2025-06-13 19:28:38 +08:00
Medcl
2251b0af95 chore: update release notes (#687) 2025-06-13 18:37:47 +08:00
BiggerRain
560a12ab93 fix: search & chat dispaly (#686) 2025-06-13 18:18:46 +08:00
ayangweb
2ff66c0b91 fix: arrow inserting escape sequences (#683)
* fix: arrow inserting escape sequences

* fix build

* docs: update changelog

---------

Co-authored-by: Steve Lau <stevelauc@outlook.com>
2025-06-13 18:06:21 +08:00
ayangweb
ef4a184233 refactor: optimize the operation of the small assistant on the secondary page (#685)
* refactor: optimize the operation of the small assistant on the secondary page

* refactor: update
2025-06-13 16:13:31 +08:00
ayangweb
8422bc03e7 refactor: optimize the timing of arrow key triggers on secondary pages (#684) 2025-06-13 15:52:20 +08:00
BiggerRain
370113129c fix: web component start page (#681) 2025-06-13 15:17:52 +08:00
ayangweb
cb758ef452 feat: context menu support for secondary pages (#680)
* feat: context menu support for secondary pages

* docs: update changelog
2025-06-13 15:07:05 +08:00
ayangweb
12b9b4bb81 refactor: blocking the default behavior of the tab key (#678)
* refactor: blocking the default behavior of the tab key

* refactor: update

* refactor: update

* refactor: update
2025-06-13 14:19:27 +08:00
BiggerRain
562db19f16 fix: filter services for unlogged-in users (#677) 2025-06-13 11:04:58 +08:00
ayangweb
dc5cd9aecb fix: fix problem with up and down key indexing (#676)
* fix: fix problem with up and down key indexing

* refactor: update

* docs: update changelog
2025-06-13 10:39:27 +08:00
BiggerRain
0b018cd24f chore: search & deep think & mcp (#675)
* fix: keep line breaks

* chore: search & deep think & mcp
2025-06-12 22:06:48 +08:00
BiggerRain
2ed22d3d7c fix: keep line breaks (#674) 2025-06-12 18:20:44 +08:00
BiggerRain
4ce9561eb7 style: safari styles (#673) 2025-06-12 14:50:02 +08:00
BiggerRain
3aeb39b3af refactor: optimize global state synchronization (#672)
* refactor: optimize global state synchronization

* refactor: reconstruct the language change processing logic

---------

Co-authored-by: ayang <473033518@qq.com>
2025-06-12 14:45:33 +08:00
BiggerRain
27e99d4629 fix: web assistant list (#671) 2025-06-12 11:28:10 +08:00
ayangweb
df70276a54 refactor: ai assistant hides the copy menu (#670)
* refactor: ai assistant hides the copy menu

* style: remove console
2025-06-12 10:39:37 +08:00
BiggerRain
6553a8f5d3 chore: add special character filtering (#668)
* chore: add special character filtering

* docs: update notes
2025-06-12 10:31:15 +08:00
ayangweb
4ebbc9ec6e refactor: improved ai overview and ai quick access blank issue (#669)
* refactor: improved ai overview and ai quick access blank issue

* refactor: update
2025-06-12 10:30:41 +08:00
BiggerRain
4208633556 fix: Fix Special Character input (#667) 2025-06-11 17:50:39 +08:00
ayangweb
fc43fbe798 refactor: improve AI assistant interaction logic and Tab key handling (#666)
* refactor: improve AI assistant interaction logic and Tab key handling

* refactor: update

* style: remove
2025-06-11 17:49:05 +08:00
ayangweb
b5bb9105d4 refactor: re-enable the service to get a list of assistants (#665) 2025-06-11 16:28:53 +08:00
BiggerRain
b6ebd6e5f8 fix: web component dispaly (#663)
* fix: web component dispaly

* fix: web component dispaly

* fix: add showChatHistory & connected

* fix: add isCurrentLogin

* chore: add history
2025-06-11 16:28:43 +08:00
ayangweb
22216491b6 refactor: dynamically generated copy button id (#664) 2025-06-11 15:52:49 +08:00
ayangweb
44ca66259c refactor: don't hide pinned window on search result open (#662)
* refactor: don't hide pinned window on search result open

* refactor: update
2025-06-11 15:26:06 +08:00
ayangweb
be3cae36e2 fix: number keys not following settings (#661)
* fix: number keys not following settings

* refactor: remove unused `modifierKey` dependencies

* docs: update changelog
2025-06-11 14:15:32 +08:00
ayangweb
35ea30626f refactor: improve tooltip display in chinese (#660) 2025-06-11 14:01:08 +08:00
BiggerRain
4bcae5cffb fix: delete history (#659) 2025-06-11 13:36:21 +08:00
BiggerRain
76458db8ab chore: remove enter disabled (#658) 2025-06-11 12:10:37 +08:00
BiggerRain
5b41e190d3 chore: add i18n to services (#657) 2025-06-11 11:03:42 +08:00
ayangweb
43ac9a054c refactor: remove the behavior that organizes event bubbling (#656) 2025-06-11 10:14:05 +08:00
BiggerRain
ac485a32cc style: user message styles (#655) 2025-06-10 19:25:54 +08:00
ayangweb
e10908a095 refactor: optimize the timing of the enter key (#654)
* refactor: optimize the timing of the enter key

* fix: remove input element

---------

Co-authored-by: rain <15911122312@163.com>
2025-06-10 19:01:25 +08:00
BiggerRain
78b8908ac8 fix: stop event bubbling (#653) 2025-06-10 18:22:54 +08:00
ayangweb
3c54cb84a8 refactor: filter unavailable servers (#652) 2025-06-10 17:37:57 +08:00
ayangweb
8ed808c591 fix: fix the problem of local path not opening (#650)
* fix: fix the problem of local path not opening

* docs: update changelog

* chore: remove pizza-engine
2025-06-10 17:26:19 +08:00
ayangweb
7a2dde7448 refactor: check if the message block is purely blank (#651) 2025-06-10 17:22:13 +08:00
BiggerRain
65451fc63e style: user message line break (#648) 2025-06-10 15:41:08 +08:00
BiggerRain
5d108a46d3 style: differentiate between hover and selected styles (#649) 2025-06-10 15:37:17 +08:00
BiggerRain
f9567c2d46 chore: remove defalut current service (#647) 2025-06-10 14:54:07 +08:00
BiggerRain
da917e6012 fix: web page unmount event (#645)
* fix: web page unmont event

* docs: update notes
2025-06-10 14:28:00 +08:00
ayangweb
335a906674 refactor: refactoring shortcut reset logic and optimizing UI interactions (#646) 2025-06-10 14:27:23 +08:00
ayangweb
a50a636d59 fix: input lost when reopening dialog after search (#644)
* fix: input lost when reopening dialog after search

* docs: update changelog
2025-06-10 11:45:45 +08:00
ayangweb
2dd3f776e6 fix: arrow keys still navigated search when menu opened with Cmd+K (#642)
* fix: arrow keys still navigated search when menu opened with `Cmd+K`

* docs: update changelog
2025-06-10 09:56:27 +08:00
BiggerRain
40f6aa0ccd chore: copy supports http protocol (#639)
* chore: copy supports http protocol

* docs: update notes
2025-06-09 18:12:43 +08:00
ayangweb
4da9e024e0 refactor: update login status when service is not enabled (#638) 2025-06-09 18:11:35 +08:00
ayangweb
c20bba51f5 fix: tab key hides window in chat mode (#641)
* fix: tab key hides window in chat mode

* docs: update changelog
2025-06-09 18:10:56 +08:00
BiggerRain
0a62a2095b fix: add shift line break to chat input (#637) 2025-06-09 15:06:59 +08:00
SteveLauC
5677995185 chore: more logs for the setup process (#634)
* chore: more logs for the setup process

* chore: more logs for the setup process

* chore: more logs for the setup process

* chore: release note
2025-06-09 14:46:06 +08:00
BiggerRain
ec4e5e7d1d fix: remove stopImmediatePropagation event (#636) 2025-06-09 12:05:27 +08:00
BiggerRain
1df5265b1a chore: add onContextMenu event (#629) 2025-06-09 11:57:48 +08:00
ayangweb
fb8a4684dc refactor: improved page content after disabling the service (#635)
* refactor: improved page content after disabling the service

* style: remove unless code

* style: remove unless code
2025-06-09 11:54:44 +08:00
BiggerRain
0b609e570d chore: web component default mode (#627) 2025-06-09 09:54:09 +08:00
BiggerRain
f91f6bdc17 fix: web component set IsDark (#630) 2025-06-07 10:49:16 +08:00
ayangweb
57590f3b57 feat: add internationalized translations of AI-related extensions (#632)
* feat: add internationalized translations of AI-related extensions

* docs: update changelog

* refactor: update
2025-06-07 10:48:55 +08:00
ayangweb
c18f9ea154 refactor: optimized input box logic for transparency (#628) 2025-06-06 17:58:18 +08:00
ayangweb
441875d9b4 refactor: optimize data filtering logic (#626) 2025-06-06 17:20:45 +08:00
ayangweb
eddf9075bb feat: add ai overview minimum number of search results configuration (#625)
* feat: add ai overview minimum number of search results configuration

* docs: update changelog

* style: remove unless code
2025-06-06 17:05:20 +08:00
ayangweb
9eac8f8a8e feat: support right-click actions after text selection (#624)
* feat: support right-click actions after text selection

* docs: update changelog

* feat: support for selecting messages sent by users
2025-06-06 16:43:27 +08:00
ayangweb
515260c43f feat: calculator extension add description (#623)
* feat: calculator extension add description

* docs: update changelog
2025-06-06 15:43:24 +08:00
ayangweb
118de0e80b fix: fix ai overview hidden height before message (#622)
* fix: fix ai overview hidden height before message

* docs: update changelog
2025-06-06 15:30:42 +08:00
SteveLauC
19ce896fdc chore: release note for PR 620 (#621) 2025-06-06 15:17:59 +08:00
SteveLauC
4a41ea5d8b fix: invalid DSL error if input contains multiple lines (#620) 2025-06-06 14:58:45 +08:00
ayangweb
880e1206ce fix: fixed modifier keys not working with continue chat (#619)
* fix: fixed modifier keys not working with continue chat

* docs: update changelog
2025-06-06 14:24:36 +08:00
SteveLauC
1e6d9f9550 fix: do not panic when the datasource specified does not exist (#618)
* fix: do not panic when the datasource specified does not exist

* release note
2025-06-06 14:07:27 +08:00
BiggerRain
ff0faf425f fix: only select history and then set the assistant (#617)
* fix: only select history and then set the assistant

* fix: only select history and then set the assistant
2025-06-06 14:06:49 +08:00
ayangweb
1fbf5d6552 fix: resolved an issue where number keys were not working on the web (#616)
* fix: resolved an issue where number keys were not working on the web

* docs: update changelog
2025-06-06 11:47:38 +08:00
ayangweb
db41e817c3 feat: add key monitoring during reset (#615)
* feat: add key monitoring during reset

* docs: update changelog
2025-06-06 11:23:40 +08:00
BiggerRain
1296755bc5 fix: datasource and mcp data updates (#614) 2025-06-06 11:11:33 +08:00
ayangweb
d410f20864 refactor: remove footer from standalone history window (#613) 2025-06-06 11:11:06 +08:00
ayangweb
61d0a3b79a fix: fix chat log update and sorting issues (#612)
* fix: fix chat log update and sorting issues

* docs: update changelog
2025-06-06 10:52:47 +08:00
BiggerRain
b24319b649 fix: datasource refresh status feedback (#611) 2025-06-06 10:51:31 +08:00
BiggerRain
3c0fb24548 fix: shortcut key prompts cannot be hidden (#610) 2025-06-06 10:51:09 +08:00
BiggerRain
2fcbed0381 fix: i18n is not accurate (#609) 2025-06-06 10:50:36 +08:00
SteveLauC
7444347e0c docs: new doc for macOS (#608) 2025-06-05 19:23:14 +08:00
SteveLauC
725ce042de docs: remove the hyperlink in title (#607) 2025-06-05 18:26:09 +08:00
BiggerRain
3b67de5387 chore: initialize current assistant from history (#606)
* chore: the last assistant in history is set as current

* docs: update notes

* docs: update notes
2025-06-05 08:54:39 +08:00
SteveLauC
9b53a026ff refactor: execute Calculator/Extension search() in spawn_blocking (#601) 2025-06-04 18:45:17 +08:00
ayangweb
9ea7dbf3aa fix: resolve regex error on older macOS versions (#605)
* fix: fix: resolve regex error on older macOS versions

* docs: update changelog

* style: remove unless code

* style: remove unless code
2025-06-04 18:38:34 +08:00
BiggerRain
55622911ac style: Switch selected color in dark mode (#604) 2025-06-04 14:10:17 +08:00
BiggerRain
92f78ad08c fix: new chat assistant id not found (#603)
* fix: new chat assistant id

* docs: update notes
2025-06-04 13:06:30 +08:00
ayangweb
f690dbaab2 refactor: web use the default icon for now (#602) 2025-06-04 11:30:59 +08:00
ayangweb
210efe763d fix: fixed issue with incorrect login status (#600)
* fix: fixed issue with incorrect login status

* style: remove unless code

* fix: user avatar error

* refactor: replace with default svg icon

* style: remove unless code

* docs: update changelog

---------

Co-authored-by: rain <15911122312@163.com>
2025-06-04 10:24:56 +08:00
BiggerRain
f23498afa0 fix: web icon isAbsolute (#599) 2025-06-03 19:28:26 +08:00
BiggerRain
a80a5d928f fix: app icon load console error (#598) 2025-06-03 15:47:58 +08:00
ayangweb
b733bb5516 feat: ai overview support is enabled with shortcut (#597)
* feat: ai overview support is enabled with shortcut

* docs: update changelog
2025-06-03 15:01:29 +08:00
ayangweb
5046754534 refactor: optimized loading of font icons on the web side (#596)
* refactor: optimized loading of font icons on the web side

* refactor: update
2025-06-03 11:22:22 +08:00
SteveLauC
f557f7e780 chore: set log level to coco_lib=trace for built Coco app (#595) 2025-06-03 11:18:28 +08:00
BiggerRain
18feb2d690 fix: set chat message assistant (#594) 2025-06-03 10:53:01 +08:00
BiggerRain
af59f2fe9f fix: web component removes redundant parameters (#593) 2025-06-03 10:35:26 +08:00
BiggerRain
5e1bb54d5e chore: web component adds variable process (#592) 2025-06-03 10:12:22 +08:00
Hardy
33fa516aad fix: rustup for i688 (#590)
Co-authored-by: hardy <luohf@infinilabs.com>
2025-06-01 07:19:28 +08:00
Hardy
d2c1cf513d chore: use version fix (#591)
Co-authored-by: hardy <luohf@infinilabs.com>
2025-05-31 20:22:53 +08:00
109 changed files with 2696 additions and 1628 deletions

View File

@@ -105,10 +105,14 @@ jobs:
chmod 600 ~/.ssh/known_hosts
- name: Pizza engine features setup
if: matrix.target != 'i686-pc-windows-msvc'
run: |
make add-dep-pizza-engine
rustup target add ${{ matrix.target}} --toolchain nightly-2025-02-28
if [[ ${{ matrix.target }} == "i686-pc-windows-msvc" ]]; then
rustup target add i686-pc-windows-msvc --toolchain stable
else
make add-dep-pizza-engine-linux
rustup target add ${{ matrix.target}} --toolchain nightly-2025-02-28
fi
- name: Build the app with ${{ matrix.platform }}
uses: tauri-apps/tauri-action@v0

View File

@@ -1,21 +1,35 @@
---
weight: 10
title: "Mac OS"
title: "macOS"
asciinema: true
---
# Mac OS
# macOS
## Download Coco AI
Goto [https://coco.rs/](https://coco.rs/)
Go to [coco.rs](https://coco.rs/) and download the package of your architecture:
{{% load-img "/img/download-mac-app.png" "" %}}
{{% load-img "/img/macos/mac-download-app.png" "" %}}
It should be placed in your "Downloads" folder:
{{% load-img "/img/macos/mac-zip-file.png" "" %}}
## Unzip DMG file
{{% load-img "/img/unzip-dmg-file.png" "" %}}
Unzip the file:
{{% load-img "/img/macos/mac-unzip-zip-file.png" "" %}}
You will get a `dmg` file:
{{% load-img "/img/macos/mac-dmg.png" "" %}}
## Drag to Application Folder
{{% load-img "/img/drag-to-application-folder.png" "" %}}
Double click the `dmg` file, a window will pop up. Then drag the "Coco-AI" app to
your "Applications" folder:
{{% load-img "/img/macos/drag-to-app-folder.png" "" %}}

View File

@@ -14,7 +14,9 @@ asciinema: true
[if_x11]: https://unix.stackexchange.com/q/202891/498440
## Goto [https://coco.rs/](https://coco.rs/)
## Go to the download page
Download page: [link](https://coco.rs/#install)
## Download the package

View File

@@ -7,11 +7,57 @@ title: "Release Notes"
Information about release notes of Coco Server is provided here.
## Latest (In development)
### ❌ Breaking changes
### 🚀 Features
### 🐛 Bug fix
### ✈️ Improvements
## Latest (In development)
### ❌ Breaking changes
### 🚀 Features
### 🐛 Bug fix
### ✈️ Improvements
## 0.5.2 (2025-06-13)
### ❌ Breaking changes
### 🚀 Features
- feat: ai overview support is enabled with shortcut #597
- feat: add key monitoring during reset #615
- feat: calculator extension add description #623
- feat: support right-click actions after text selection #624
- feat: add ai overview minimum number of search results configuration #625
- feat: add internationalized translations of AI-related extensions #632
- feat: context menu support for secondary pages #680
### 🐛 Bug fix
- fix: fixed issue with incorrect login status #600
- fix: new chat assistant id not found #603
- fix: resolve regex error on older macOS versions #605
- fix: fix chat log update and sorting issues #612
- fix: resolved an issue where number keys were not working on the web #616
- fix: do not panic when the datasource specified does not exist #618
- fix: fixed modifier keys not working with continue chat #619
- fix: invalid DSL error if input contains multiple lines #620
- fix: fix ai overview hidden height before message #622
- fix: tab key hides window in chat mode #641
- fix: arrow keys still navigated search when menu opened with Cmd+K #642
- fix: input lost when reopening dialog after search #644
- fix: web page unmount event #645
- fix: fix the problem of local path not opening #650
- fix: number keys not following settings #661
- fix: fix problem with up and down key indexing #676
- fix: arrow inserting escape sequences #683
### ✈️ Improvements
- chore: initialize current assistant from history #606
- chore: add onContextMenu event #629
- chore: more logs for the setup process #634
- chore: copy supports http protocol #639
- chore: add special character filtering #668
## 0.5.1 (2025-05-31)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 155 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 KiB

BIN
docs/static/img/macos/mac-dmg.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 650 KiB

BIN
docs/static/img/macos/mac-zip-file.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 441 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 KiB

View File

@@ -1,7 +1,7 @@
{
"name": "coco",
"private": true,
"version": "0.5.2",
"version": "0.5.0",
"type": "module",
"scripts": {
"dev": "vite",
@@ -27,6 +27,7 @@
"@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-opener": "^2.2.7",
"@tauri-apps/plugin-os": "^2.2.1",
"@tauri-apps/plugin-process": "^2.2.1",
"@tauri-apps/plugin-shell": "^2.2.1",
@@ -44,6 +45,7 @@
"i18next-browser-languagedetector": "^8.1.0",
"lodash-es": "^4.17.21",
"lucide-react": "^0.461.0",
"mdast-util-gfm-autolink-literal": "2.0.0",
"mermaid": "^11.6.0",
"nanoid": "^5.1.5",
"react": "^18.3.1",

75
pnpm-lock.yaml generated
View File

@@ -35,6 +35,9 @@ importers:
'@tauri-apps/plugin-log':
specifier: ~2.4.0
version: 2.4.0
'@tauri-apps/plugin-opener':
specifier: ^2.2.7
version: 2.2.7
'@tauri-apps/plugin-os':
specifier: ^2.2.1
version: 2.2.1
@@ -86,6 +89,9 @@ importers:
lucide-react:
specifier: ^0.461.0
version: 0.461.0(react@18.3.1)
mdast-util-gfm-autolink-literal:
specifier: 2.0.0
version: 2.0.0
mermaid:
specifier: ^11.6.0
version: 11.6.0
@@ -185,7 +191,7 @@ importers:
version: 1.8.8
'@vitejs/plugin-react':
specifier: ^4.4.1
version: 4.4.1(vite@5.4.19(@types/node@22.15.17)(sass@1.87.0))
version: 4.4.1(vite@5.4.19(@types/node@22.15.17)(sass@1.87.0)(terser@5.40.0))
autoprefixer:
specifier: ^10.4.21
version: 10.4.21(postcss@8.5.3)
@@ -218,7 +224,7 @@ importers:
version: 5.8.3
vite:
specifier: ^5.4.19
version: 5.4.19(@types/node@22.15.17)(sass@1.87.0)
version: 5.4.19(@types/node@22.15.17)(sass@1.87.0)(terser@5.40.0)
packages:
@@ -816,6 +822,9 @@ packages:
resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
engines: {node: '>=6.0.0'}
'@jridgewell/source-map@0.3.6':
resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
'@jridgewell/sourcemap-codec@1.5.0':
resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
@@ -1259,6 +1268,9 @@ packages:
'@tauri-apps/plugin-log@2.4.0':
resolution: {integrity: sha512-j7yrDtLNmayCBOO2esl3aZv9jSXy2an8MDLry3Ys9ZXerwUg35n1Y2uD8HoCR+8Ng/EUgx215+qOUfJasjYrHw==}
'@tauri-apps/plugin-opener@2.2.7':
resolution: {integrity: sha512-uduEyvOdjpPOEeDRrhwlCspG/f9EQalHumWBtLBnp3fRp++fKGLqDOyUhSIn7PzX45b/rKep//ZQSAQoIxobLA==}
'@tauri-apps/plugin-os@2.2.1':
resolution: {integrity: sha512-cNYpNri2CCc6BaNeB6G/mOtLvg8dFyFQyCUdf2y0K8PIAKGEWdEcu8DECkydU2B+oj4OJihDPD2de5K6cbVl9A==}
@@ -1586,6 +1598,9 @@ packages:
engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
hasBin: true
buffer-from@1.1.2:
resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
bundle-name@4.1.0:
resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
engines: {node: '>=18'}
@@ -1698,6 +1713,9 @@ packages:
comma-separated-tokens@2.0.3:
resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==}
commander@2.20.3:
resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
commander@4.1.1:
resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
engines: {node: '>= 6'}
@@ -2643,8 +2661,8 @@ packages:
mdast-util-from-markdown@2.0.2:
resolution: {integrity: sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==}
mdast-util-gfm-autolink-literal@2.0.1:
resolution: {integrity: sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==}
mdast-util-gfm-autolink-literal@2.0.0:
resolution: {integrity: sha512-FyzMsduZZHSc3i0Px3PQcBT4WJY/X/RCtEJKuybiC6sjPqLv7h1yqAkmILZtuxMSsUyaLUWNp71+vQH2zqp5cg==}
mdast-util-gfm-footnote@2.1.0:
resolution: {integrity: sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==}
@@ -3349,6 +3367,9 @@ packages:
resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
engines: {node: '>=0.10.0'}
source-map-support@0.5.21:
resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
source-map@0.6.1:
resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
engines: {node: '>=0.10.0'}
@@ -3443,6 +3464,11 @@ packages:
tauri-plugin-windows-version-api@2.0.0:
resolution: {integrity: sha512-tty5n4ASYbXpnsD5ws2iTcTTpDCrSbzRTVp5Bo3UTpYGqlN1gBn2Zk8s3oO4w7VIM5WtJhDM9Jr/UgoTk7tFJQ==}
terser@5.40.0:
resolution: {integrity: sha512-cfeKl/jjwSR5ar7d0FGmave9hFGJT8obyo0z+CrQOylLDbk7X81nPU6vq9VORa5jU30SkDnT2FXjLbR8HLP+xA==}
engines: {node: '>=10'}
hasBin: true
thenify-all@1.6.0:
resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
engines: {node: '>=0.8'}
@@ -4263,6 +4289,12 @@ snapshots:
'@jridgewell/set-array@1.2.1': {}
'@jridgewell/source-map@0.3.6':
dependencies:
'@jridgewell/gen-mapping': 0.3.8
'@jridgewell/trace-mapping': 0.3.25
optional: true
'@jridgewell/sourcemap-codec@1.5.0': {}
'@jridgewell/trace-mapping@0.3.25':
@@ -4640,6 +4672,10 @@ snapshots:
dependencies:
'@tauri-apps/api': 2.5.0
'@tauri-apps/plugin-opener@2.2.7':
dependencies:
'@tauri-apps/api': 2.5.0
'@tauri-apps/plugin-os@2.2.1':
dependencies:
'@tauri-apps/api': 2.5.0
@@ -4881,14 +4917,14 @@ snapshots:
'@ungap/structured-clone@1.3.0': {}
'@vitejs/plugin-react@4.4.1(vite@5.4.19(@types/node@22.15.17)(sass@1.87.0))':
'@vitejs/plugin-react@4.4.1(vite@5.4.19(@types/node@22.15.17)(sass@1.87.0)(terser@5.40.0))':
dependencies:
'@babel/core': 7.27.1
'@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.27.1)
'@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.27.1)
'@types/babel__core': 7.20.5
react-refresh: 0.17.0
vite: 5.4.19(@types/node@22.15.17)(sass@1.87.0)
vite: 5.4.19(@types/node@22.15.17)(sass@1.87.0)(terser@5.40.0)
transitivePeerDependencies:
- supports-color
@@ -5017,6 +5053,9 @@ snapshots:
node-releases: 2.0.19
update-browserslist-db: 1.1.3(browserslist@4.24.5)
buffer-from@1.1.2:
optional: true
bundle-name@4.1.0:
dependencies:
run-applescript: 7.0.0
@@ -5113,6 +5152,9 @@ snapshots:
comma-separated-tokens@2.0.3: {}
commander@2.20.3:
optional: true
commander@4.1.1: {}
commander@7.2.0: {}
@@ -6117,7 +6159,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
mdast-util-gfm-autolink-literal@2.0.1:
mdast-util-gfm-autolink-literal@2.0.0:
dependencies:
'@types/mdast': 4.0.4
ccount: 2.0.1
@@ -6165,7 +6207,7 @@ snapshots:
mdast-util-gfm@3.1.0:
dependencies:
mdast-util-from-markdown: 2.0.2
mdast-util-gfm-autolink-literal: 2.0.1
mdast-util-gfm-autolink-literal: 2.0.0
mdast-util-gfm-footnote: 2.1.0
mdast-util-gfm-strikethrough: 2.0.0
mdast-util-gfm-table: 2.0.0
@@ -7124,6 +7166,12 @@ snapshots:
source-map-js@1.2.1: {}
source-map-support@0.5.21:
dependencies:
buffer-from: 1.1.2
source-map: 0.6.1
optional: true
source-map@0.6.1:
optional: true
@@ -7243,6 +7291,14 @@ snapshots:
dependencies:
'@tauri-apps/api': 2.5.0
terser@5.40.0:
dependencies:
'@jridgewell/source-map': 0.3.6
acorn: 8.14.1
commander: 2.20.3
source-map-support: 0.5.21
optional: true
thenify-all@1.6.0:
dependencies:
thenify: 3.3.1
@@ -7429,7 +7485,7 @@ snapshots:
'@types/unist': 3.0.3
vfile-message: 4.0.2
vite@5.4.19(@types/node@22.15.17)(sass@1.87.0):
vite@5.4.19(@types/node@22.15.17)(sass@1.87.0)(terser@5.40.0):
dependencies:
esbuild: 0.21.5
postcss: 8.5.3
@@ -7438,6 +7494,7 @@ snapshots:
'@types/node': 22.15.17
fsevents: 2.3.3
sass: 1.87.0
terser: 5.40.0
void-elements@3.1.0: {}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
scripts/devWeb.ts Normal file
View File

@@ -0,0 +1 @@
(() => {})();

25
src-tauri/Cargo.lock generated
View File

@@ -821,7 +821,7 @@ dependencies = [
[[package]]
name = "coco"
version = "0.5.2"
version = "0.5.0"
dependencies = [
"anyhow",
"applications",
@@ -866,6 +866,7 @@ dependencies = [
"tauri-plugin-http",
"tauri-plugin-log",
"tauri-plugin-macos-permissions",
"tauri-plugin-opener",
"tauri-plugin-os",
"tauri-plugin-process",
"tauri-plugin-screenshots",
@@ -6279,6 +6280,28 @@ dependencies = [
"thiserror 2.0.12",
]
[[package]]
name = "tauri-plugin-opener"
version = "2.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66644b71a31ec1a8a52c4a16575edd28cf763c87cf4a7da24c884122b5c77097"
dependencies = [
"dunce",
"glob",
"objc2-app-kit 0.3.1",
"objc2-foundation 0.3.1",
"open",
"schemars",
"serde",
"serde_json",
"tauri",
"tauri-plugin",
"thiserror 2.0.12",
"url",
"windows 0.61.1",
"zbus",
]
[[package]]
name = "tauri-plugin-os"
version = "2.2.1"

View File

@@ -1,6 +1,6 @@
[package]
name = "coco"
version = "0.5.2"
version = "0.5.0"
description = "Search, connect, collaborate all in one place."
authors = ["INFINI Labs"]
edition = "2021"
@@ -44,7 +44,7 @@ use_pizza_engine = []
[dependencies]
pizza-common = { git = "https://github.com/infinilabs/pizza-common", branch = "main" }
tauri = { version = "2", features = ["protocol-asset", "macos-private-api", "tray-icon", "image-ico", "image-png", "unstable"] }
tauri = { version = "2", features = ["protocol-asset", "macos-private-api", "tray-icon", "image-ico", "image-png"] }
tauri-plugin-shell = "2"
serde = { version = "1", features = ["derive"] }
# Need `arbitrary_precision` feature to support storing u128
@@ -98,6 +98,7 @@ derive_more = { version = "2.0.1", features = ["display"] }
anyhow = "1.0.98"
function_name = "0.3.0"
regex = "1.11.1"
tauri-plugin-opener = "2"
[target."cfg(target_os = \"macos\")".dependencies]
tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2" }

View File

@@ -71,6 +71,7 @@
"process:default",
"updater:default",
"windows-version:default",
"log:default"
"log:default",
"opener:default"
]
}

View File

@@ -3,38 +3,43 @@ use std::{fs::create_dir, io::Read};
use tauri::{Manager, Runtime};
use tauri_plugin_autostart::ManagerExt;
// Start or stop according to configuration
pub fn enable_autostart(app: &mut tauri::App) {
use tauri_plugin_autostart::MacosLauncher;
use tauri_plugin_autostart::ManagerExt;
app.handle()
.plugin(tauri_plugin_autostart::init(
MacosLauncher::AppleScript,
None,
))
.unwrap();
/// If the state reported from the OS and the state stored by us differ, our state is
/// prioritized and seen as the correct one. Update the OS state to make them consistent.
pub fn ensure_autostart_state_consistent(app: &mut tauri::App) -> Result<(), String> {
let autostart_manager = app.autolaunch();
// close autostart
// autostart_manager.disable().unwrap();
// return;
let os_state = autostart_manager.is_enabled().map_err(|e| e.to_string())?;
let coco_stored_state = current_autostart(app.app_handle()).map_err(|e| e.to_string())?;
match (
autostart_manager.is_enabled(),
current_autostart(app.app_handle()),
) {
(Ok(false), Ok(true)) => match autostart_manager.enable() {
Ok(_) => println!("Autostart enabled successfully."),
Err(err) => eprintln!("Failed to enable autostart: {}", err),
},
(Ok(true), Ok(false)) => match autostart_manager.disable() {
Ok(_) => println!("Autostart disable successfully."),
Err(err) => eprintln!("Failed to disable autostart: {}", err),
},
_ => (),
if os_state != coco_stored_state {
log::warn!(
"autostart inconsistent states, OS state [{}], Coco state [{}], config file could be deleted or corrupted",
os_state,
coco_stored_state
);
log::info!("trying to correct the inconsistent states");
let result = if coco_stored_state {
autostart_manager.enable()
} else {
autostart_manager.disable()
};
match result {
Ok(_) => {
log::info!("inconsistent autostart states fixed");
}
Err(e) => {
log::error!(
"failed to fix inconsistent autostart state due to error [{}]",
e
);
return Err(e.to_string());
}
}
}
Ok(())
}
fn current_autostart<R: Runtime>(app: &tauri::AppHandle<R>) -> Result<bool, String> {

View File

@@ -1,8 +1,6 @@
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use crate::hide_coco;
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct RichLabel {
pub label: Option<String>,
@@ -93,7 +91,6 @@ pub(crate) async fn open(on_opened: OnOpened) -> Result<(), String> {
}
}
hide_coco(global_tauri_app_handle.clone()).await;
Ok(())
}

View File

@@ -47,7 +47,6 @@ const TAURI_STORE_APP_ALIAS: &str = "app_alias";
const TAURI_STORE_KEY_SEARCH_PATH: &str = "search_path";
const TAURI_STORE_KEY_DISABLED_APP_LIST: &str = "disabled_app_list";
/// We use this as:
///
/// 1. querysource ID
@@ -194,9 +193,9 @@ macro_rules! task_exec_try {
};
}
// Fields `engine` and `writer` become unused without app list synchronizer, allow
// Fields `engine` and `writer` become unused without app list synchronizer, allow
// this rather than removing these fields as we will bring the synchronizer back.
#[allow(dead_code)]
#[allow(dead_code)]
struct ApplicationSearchSourceState {
engine: Engine<DiskStore>,
writer: Writer<DiskStore>,
@@ -330,8 +329,19 @@ impl<R: Runtime> Task for SearchApplicationsTask<R> {
let disabled_app_list = get_disabled_app_list(&self.tauri_app_handle);
// TODO: search via alias, implement this when Pizza engine supports update
//
// NOTE: we use the Debug impl rather than Display for `self.query_string` as String's Debug
// impl won't interrupt escape characters. So for input like:
//
// ```text
// Google
// Chrome
// ```
//
// It will be passed to Pizza like "Google\nChrome". Using Display impl would result
// in an invalid query DSL and serde will complain.
let dsl = format!(
"{{ \"query\": {{ \"bool\": {{ \"should\": [ {{ \"match\": {{ \"{FIELD_APP_NAME}\": \"{}\" }} }}, {{ \"prefix\": {{ \"{FIELD_APP_NAME}\": \"{}\" }} }} ] }} }} }}", self.query_string, self.query_string);
"{{ \"query\": {{ \"bool\": {{ \"should\": [ {{ \"match\": {{ \"{FIELD_APP_NAME}\": {:?} }} }}, {{ \"prefix\": {{ \"{FIELD_APP_NAME}\": {:?} }} }} ] }} }} }}", self.query_string, self.query_string);
let state = state
.as_mut()
@@ -375,9 +385,9 @@ impl<R: Runtime> Task for SearchApplicationsTask<R> {
///
/// We use this task to index them.
//
// This become unused without app list synchronizer, allow this rather than
// This become unused without app list synchronizer, allow this rather than
// removing the task as we will bring the synchronizer back.
#[allow(dead_code)]
#[allow(dead_code)]
struct IndexNewApplicationsTask {
applications: Vec<PizzaEngineDraftDoc>,
callback: Option<tokio::sync::oneshot::Sender<Result<(), String>>>,

View File

@@ -23,7 +23,7 @@ impl CalculatorSource {
}
}
fn parse_query(query: String) -> Value {
fn parse_query(query: &str) -> Value {
let mut query_json = serde_json::Map::new();
let operators = ["+", "-", "*", "/", "%"];
@@ -48,7 +48,7 @@ fn parse_query(query: String) -> Value {
query_json.insert("type".to_string(), Value::String("expression".to_string()));
}
query_json.insert("value".to_string(), Value::String(query));
query_json.insert("value".to_string(), Value::String(query.to_string()));
Value::Object(query_json)
}
@@ -128,42 +128,56 @@ impl SearchSource for CalculatorSource {
});
}
match meval::eval_str(query_string) {
Ok(num) => {
let mut payload: HashMap<String, Value> = HashMap::new();
let query_string_clone = query_string.to_string();
let query_source = self.get_type();
let base_score = self.base_score;
let closure = move || -> QueryResponse {
let res_num = meval::eval_str(&query_string_clone);
let payload_query = parse_query(query_string.into());
let payload_result = parse_result(num);
match res_num {
Ok(num) => {
let mut payload: HashMap<String, Value> = HashMap::new();
payload.insert("query".to_string(), payload_query);
payload.insert("result".to_string(), payload_result);
let payload_query = parse_query(&query_string_clone);
let payload_result = parse_result(num);
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: Some(String::from("font_Calculator")),
}),
..Default::default()
};
payload.insert("query".to_string(), payload_query);
payload.insert("result".to_string(), payload_result);
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,
});
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: Some(String::from("font_Calculator")),
}),
..Default::default()
};
QueryResponse {
source: query_source,
hits: vec![(doc, base_score)],
total_hits: 1,
}
}
Err(_) => {
QueryResponse {
source: query_source,
hits: Vec::new(),
total_hits: 0,
}
}
}
};
let spawn_result = tokio::task::spawn_blocking(closure).await;
match spawn_result {
Ok(response) => Ok(response),
Err(e) => std::panic::resume_unwind(e.into_panic()),
}
}
}

View File

@@ -27,25 +27,50 @@ pub(crate) trait Task: Send + Sync {
pub(crate) 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();
/// This function blocks until the runtime thread is ready for accepting tasks.
pub(crate) async fn start_pizza_engine_runtime() {
const THREAD_NAME: &str = "Pizza engine runtime thread";
let main = async {
let mut states: HashMap<String, Option<Box<dyn SearchSourceState>>> = HashMap::new();
log::trace!("starting Pizza engine runtime");
let (engine_start_signal_tx, engine_start_signal_rx) = tokio::sync::oneshot::channel();
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
RUNTIME_TX.set(tx).unwrap();
std::thread::Builder::new()
.name(THREAD_NAME.into())
.spawn(move || {
let rt = tokio::runtime::Runtime::new().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;
}
};
let main = async {
let mut states: HashMap<String, Option<Box<dyn SearchSourceState>>> =
HashMap::new();
rt.block_on(main);
});
let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel();
RUNTIME_TX.set(tx).unwrap();
engine_start_signal_tx
.send(())
.expect("engine_start_signal_rx dropped");
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);
})
.unwrap_or_else(|e| {
panic!(
"failed to start thread [{}] due to error [{}]",
THREAD_NAME, e
);
});
engine_start_signal_rx
.await
.expect("engine_start_signal_tx dropped, the runtime thread could be dead");
log::trace!("Pizza engine runtime started");
}

View File

@@ -492,47 +492,62 @@ impl SearchSource for ThirdPartyExtensionsSearchSource {
let opt_data_source = query
.query_strings
.get("datasource")
.map(|owned_str| owned_str.as_str());
.map(|owned_str| owned_str.to_string());
let mut hits = Vec::new();
let extensions_read_lock = self.inner.extensions.read().await;
let query_lower = query_string.to_lowercase();
let inner_clone = Arc::clone(&self.inner);
for extension in extensions_read_lock.iter().filter(|ext| ext.enabled) {
if extension.r#type.contains_sub_items() {
if let Some(ref commands) = extension.commands {
for command in commands.iter().filter(|cmd| cmd.enabled) {
if let Some(hit) = extension_to_hit(command, &query_lower, opt_data_source)
{
hits.push(hit);
let closure = move || {
let mut hits = Vec::new();
let extensions_read_lock = futures::executor::block_on(async { inner_clone.extensions.read().await });
for extension in extensions_read_lock.iter().filter(|ext| ext.enabled) {
if extension.r#type.contains_sub_items() {
if let Some(ref commands) = extension.commands {
for command in commands.iter().filter(|cmd| cmd.enabled) {
if let Some(hit) =
extension_to_hit(command, &query_lower, opt_data_source.as_deref())
{
hits.push(hit);
}
}
}
}
if let Some(ref scripts) = extension.scripts {
for script in scripts.iter().filter(|script| script.enabled) {
if let Some(hit) = extension_to_hit(script, &query_lower, opt_data_source) {
hits.push(hit);
if let Some(ref scripts) = extension.scripts {
for script in scripts.iter().filter(|script| script.enabled) {
if let Some(hit) =
extension_to_hit(script, &query_lower, opt_data_source.as_deref())
{
hits.push(hit);
}
}
}
}
if let Some(ref quick_links) = extension.quick_links {
for quick_link in quick_links.iter().filter(|link| link.enabled) {
if let Some(hit) =
extension_to_hit(quick_link, &query_lower, opt_data_source)
{
hits.push(hit);
if let Some(ref quick_links) = extension.quick_links {
for quick_link in quick_links.iter().filter(|link| link.enabled) {
if let Some(hit) =
extension_to_hit(quick_link, &query_lower, opt_data_source.as_deref())
{
hits.push(hit);
}
}
}
}
} else {
if let Some(hit) = extension_to_hit(extension, &query_lower, opt_data_source) {
hits.push(hit);
} else {
if let Some(hit) = extension_to_hit(extension, &query_lower, opt_data_source.as_deref()) {
hits.push(hit);
}
}
}
}
hits
};
let join_result = tokio::task::spawn_blocking(closure).await;
let hits = match join_result {
Ok(hits) => hits,
Err(e) => std::panic::resume_unwind(e.into_panic()),
};
let total_hits = hits.len();
Ok(QueryResponse {

View File

@@ -13,16 +13,14 @@ use crate::common::register::SearchSourceRegistry;
// use crate::common::traits::SearchSource;
use crate::common::{MAIN_WINDOW_LABEL, SETTINGS_WINDOW_LABEL};
use crate::server::servers::{load_or_insert_default_server, load_servers_token};
use autostart::{change_autostart, enable_autostart};
use autostart::{change_autostart, ensure_autostart_state_consistent};
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,
AppHandle, Emitter, Manager, PhysicalPosition, Runtime, WebviewWindow, WindowEvent,
};
use tauri_plugin_autostart::MacosLauncher;
@@ -64,6 +62,8 @@ pub fn run() {
let ctx = tauri::generate_context!();
let mut app_builder = tauri::Builder::default();
// Set up logger first
app_builder = app_builder.plugin(set_up_tauri_logger());
#[cfg(desktop)]
{
@@ -77,7 +77,7 @@ pub fn run() {
.plugin(tauri_plugin_http::init())
.plugin(tauri_plugin_shell::init())
.plugin(tauri_plugin_autostart::init(
MacosLauncher::AppleScript,
MacosLauncher::LaunchAgent,
None,
))
.plugin(tauri_plugin_deep_link::init())
@@ -89,7 +89,7 @@ pub fn run() {
.plugin(tauri_plugin_process::init())
.plugin(tauri_plugin_updater::Builder::new().build())
.plugin(tauri_plugin_windows_version::init())
.plugin(set_up_tauri_logger());
.plugin(tauri_plugin_opener::init());
// Conditional compilation for macOS
#[cfg(target_os = "macos")]
@@ -162,10 +162,18 @@ pub fn run() {
crate::common::document::open,
])
.setup(|app| {
#[cfg(target_os = "macos")]
{
log::trace!("hiding Dock icon on macOS");
app.set_activation_policy(tauri::ActivationPolicy::Accessory);
log::trace!("Dock icon should be hidden now");
}
let app_handle = app.handle().clone();
GLOBAL_TAURI_APP_HANDLE
.set(app_handle.clone())
.expect("variable already initialized");
log::trace!("global Tauri app handle set");
let registry = SearchSourceRegistry::default();
@@ -178,10 +186,7 @@ pub fn run() {
shortcut::enable_shortcut(app);
enable_autostart(app);
#[cfg(target_os = "macos")]
app.set_activation_policy(ActivationPolicy::Accessory);
ensure_autostart_state_consistent(app)?;
// app.listen("theme-changed", move |event| {
// if let Ok(payload) = serde_json::from_str::<ThemeChangedPayload>(event.payload()) {
@@ -261,12 +266,12 @@ pub async fn init<R: Runtime>(app_handle: &AppHandle<R>) {
.await;
}
extension::built_in::pizza_engine_runtime::start_pizza_engine_runtime();
extension::built_in::pizza_engine_runtime::start_pizza_engine_runtime().await;
}
#[tauri::command]
async fn show_coco<R: Runtime>(app_handle: AppHandle<R>) {
if let Some(window) = app_handle.get_window(MAIN_WINDOW_LABEL) {
if let Some(window) = app_handle.get_webview_window(MAIN_WINDOW_LABEL) {
move_window_to_active_monitor(&window);
let _ = window.show();
@@ -279,7 +284,7 @@ async fn show_coco<R: Runtime>(app_handle: AppHandle<R>) {
#[tauri::command]
async fn hide_coco<R: Runtime>(app: AppHandle<R>) {
if let Some(window) = app.get_window(MAIN_WINDOW_LABEL) {
if let Some(window) = app.get_webview_window(MAIN_WINDOW_LABEL) {
if let Err(err) = window.hide() {
log::error!("Failed to hide the window: {}", err);
} else {
@@ -290,7 +295,7 @@ async fn hide_coco<R: Runtime>(app: AppHandle<R>) {
}
}
fn move_window_to_active_monitor<R: Runtime>(window: &Window<R>) {
fn move_window_to_active_monitor<R: Runtime>(window: &WebviewWindow<R>) {
//dbg!("Moving window to active monitor");
// Try to get the available monitors, handle failure gracefully
let available_monitors = match window.available_monitors() {
@@ -383,38 +388,6 @@ fn move_window_to_active_monitor<R: Runtime>(window: &Window<R>) {
}
}
#[allow(dead_code)]
fn open_settings(app: &tauri::AppHandle) {
use tauri::webview::WebviewBuilder;
log::debug!("settings menu item was clicked");
let window = app.get_webview_window("settings");
if let Some(window) = window {
let _ = window.show();
let _ = window.unminimize();
let _ = window.set_focus();
} else {
let window = tauri::window::WindowBuilder::new(app, "settings")
.title("Settings Window")
.fullscreen(false)
.resizable(false)
.minimizable(false)
.maximizable(false)
.inner_size(800.0, 600.0)
.build()
.unwrap();
let webview_builder =
WebviewBuilder::new("settings", tauri::WebviewUrl::App("/ui/settings".into()));
let _webview = window
.add_child(
webview_builder,
tauri::LogicalPosition::new(0, 0),
window.inner_size().unwrap(),
)
.unwrap();
}
}
#[tauri::command]
async fn get_app_search_source<R: Runtime>(app_handle: AppHandle<R>) -> Result<(), String> {
let (_found_invalid_extensions, extensions) = extension::list_extensions()
@@ -430,7 +403,14 @@ async fn get_app_search_source<R: Runtime>(app_handle: AppHandle<R>) -> Result<(
#[tauri::command]
async fn show_settings(app_handle: AppHandle) {
open_settings(&app_handle);
log::debug!("settings menu item was clicked");
let window = app_handle
.get_webview_window(SETTINGS_WINDOW_LABEL)
.expect("we have a settings window");
window.show().unwrap();
window.unminimize().unwrap();
window.set_focus().unwrap();
}
#[tauri::command]
@@ -585,6 +565,12 @@ fn set_up_tauri_logger() -> TauriPlugin<tauri::Wry> {
builder
}
// When running the built binary, set `COCO_LOG` to `coco_lib=trace` to capture all logs
// that come from Coco in the log file, which helps with debugging.
if !tauri::is_dev() {
std::env::set_var("COCO_LOG", "coco_lib=trace");
}
let mut builder = tauri_plugin_log::Builder::new();
builder = builder.format(|out, message, record| {
let now = chrono::Local::now().format("%m-%d %H:%M:%S");

View File

@@ -32,7 +32,7 @@ fn same_type_futures(
timeout_duration: Duration,
search_query: SearchQuery,
) -> impl Future<
Output=(
Output = (
QuerySource,
Result<Result<QueryResponse, SearchError>, Elapsed>,
),
@@ -44,7 +44,7 @@ fn same_type_futures(
timeout(timeout_duration, async {
query_source_trait_object.search(search_query).await
})
.await,
.await,
)
}
}
@@ -92,11 +92,30 @@ pub async fn query_coco_fusion<R: Runtime>(
query_source_id
);
let query_source_trait_object_index = sources_list
let opt_query_source_trait_object_index = sources_list
.iter()
.position(|query_source| &query_source.get_type().id == query_source_id).unwrap_or_else(|| {
panic!("frontend code invoked {}() with parameter [querysource={}], but we do not have this query source, the states are inconsistent! Available query sources {:?}", function_name!(), query_source_id, sources_list.iter().map(|qs| qs.get_type().id).collect::<Vec<_>>());
});
.position(|query_source| &query_source.get_type().id == query_source_id);
let Some(query_source_trait_object_index) = opt_query_source_trait_object_index else {
// It is possible (an edge case) that the frontend invokes `query_coco_fusion()` with a
// datasource that does not exist in the source list:
//
// 1. Search applications
// 2. Navigate to the application sub page
// 3. Disable the application extension in settings
// 4. hide the search window
// 5. Re-open the search window and search for something
//
// The application search source is not in the source list because the extension
// has been disabled, but the last search is indeed invoked with parameter
// `datasource=application`.
return Ok(MultiSourceQueryResponse {
failed: Vec::new(),
hits: Vec::new(),
total_hits: 0,
});
};
let query_source_trait_object = sources_list.remove(query_source_trait_object_index);
let query_source = query_source_trait_object.get_type();

View File

@@ -1,5 +1,5 @@
//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::{App, Emitter, EventTarget, WebviewWindow};
use tauri_nspanel::{cocoa::appkit::NSWindowCollectionBehavior, panel_delegate, WebviewWindowExt};
use crate::common::MAIN_WINDOW_LABEL;
@@ -12,9 +12,7 @@ const WINDOW_BLUR_EVENT: &str = "tauri://blur";
const WINDOW_MOVED_EVENT: &str = "tauri://move";
const WINDOW_RESIZED_EVENT: &str = "tauri://resize";
pub fn platform(app: &mut App, main_window: WebviewWindow, _settings_window: WebviewWindow) {
app.set_activation_policy(ActivationPolicy::Accessory);
pub fn platform(_app: &mut App, main_window: WebviewWindow, _settings_window: WebviewWindow) {
// Convert ns_window to ns_panel
let panel = main_window.to_panel().unwrap();

View File

@@ -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(all(dev, debug_assertions))]
#[cfg(debug_assertions)]
main_window.open_devtools();
platform(app, main_window.clone(), settings_window.clone());

View File

@@ -17,6 +17,7 @@ const DEFAULT_SHORTCUT: &str = "ctrl+shift+space";
/// Set up the shortcut upon app start.
pub fn enable_shortcut(app: &App) {
log::trace!("setting up Coco hotkey");
let store = app
.store(COCO_TAURI_STORE)
.expect("creating a store should not fail");
@@ -43,6 +44,7 @@ pub fn enable_shortcut(app: &App) {
.expect("default shortcut should never be invalid");
_register_shortcut_upon_start(app, default_shortcut);
}
log::trace!("Coco hotkey has been set");
}
/// Get the stored shortcut as a string, same as [`_get_shortcut()`], except that
@@ -97,7 +99,7 @@ fn _register_shortcut<R: Runtime>(app: &AppHandle<R>, shortcut: Shortcut) {
.on_shortcut(shortcut, move |app, scut, event| {
if scut == &shortcut {
dbg!("shortcut pressed");
let main_window = app.get_window(MAIN_WINDOW_LABEL).unwrap();
let main_window = app.get_webview_window(MAIN_WINDOW_LABEL).unwrap();
if let ShortcutState::Pressed = event.state() {
let app_handle = app.clone();
if main_window.is_visible().unwrap() {
@@ -126,7 +128,7 @@ fn _register_shortcut_upon_start(app: &App, shortcut: Shortcut) {
tauri_plugin_global_shortcut::Builder::new()
.with_handler(move |app, scut, event| {
if scut == &shortcut {
let window = app.get_window(MAIN_WINDOW_LABEL).unwrap();
let window = app.get_webview_window(MAIN_WINDOW_LABEL).unwrap();
if let ShortcutState::Pressed = event.state() {
let app_handle = app.clone();

View File

@@ -29,6 +29,7 @@ const WHITELIST_SERVERS = [
"refresh_coco_server_info",
"handle_sso_callback",
"query_coco_fusion",
"open_session_chat", // TODO: quick ai access is a configured service, even if the current service is not logged in, it should not affect the configured service.
];
async function invokeWithErrorHandler<T>(
@@ -50,7 +51,7 @@ async function invokeWithErrorHandler<T>(
const failedResult = result as any;
if (failedResult.failed?.length > 0 && failedResult?.hits?.length == 0) {
failedResult.failed.forEach((error: any) => {
addError(error.error, 'error');
addError(error.error, "error");
// console.error(error.error);
});
}

View File

@@ -31,6 +31,13 @@ export const AssistantFetcher = ({
serverId?: string;
}) => {
try {
if (isTauri && !currentService?.enabled) {
return {
total: 0,
list: [],
};
}
const { pageSize, current, serverId = currentService?.id } = params;
const from = (current - 1) * pageSize;
@@ -78,6 +85,7 @@ export const AssistantFetcher = ({
response = await platformAdapter.commands("assistant_search", body);
} else {
body.serverId = undefined;
const [error, res] = await Post(`/assistant/_search`, body);
if (error) {

View File

@@ -17,6 +17,8 @@ import { AssistantFetcher } from "./AssistantFetcher";
import AssistantItem from "./AssistantItem";
import Pagination from "@/components/Common/Pagination";
import { useSearchStore } from "@/stores/searchStore";
import { useChatStore } from "@/stores/chatStore";
import { specialCharacterFiltering } from "@/utils"
interface AssistantListProps {
assistantIDs?: string[];
@@ -43,17 +45,40 @@ export function AssistantList({ assistantIDs = [] }: AssistantListProps) {
return state.setAskAiAssistantId;
});
const assistantList = useConnectStore((state) => state.assistantList);
const connected = useChatStore((state) => {
return state.connected;
});
const { fetchAssistant } = AssistantFetcher({
debounceKeyword,
assistantIDs,
});
const { pagination, runAsync } = usePagination(fetchAssistant, {
const getAssistants = (params: { current: number; pageSize: number }) => {
if (!connected) {
return Promise.resolve({
total: 0,
list: [],
});
}
return fetchAssistant(params);
};
const { pagination, runAsync } = usePagination(getAssistants, {
defaultPageSize: 5,
refreshDeps: [currentService?.id, debounceKeyword],
refreshDeps: [
currentService?.id,
debounceKeyword,
currentService?.enabled,
connected,
],
onSuccess(data) {
setAssistants(data.list);
if (data.list.length === 0) {
setCurrentAssistant(void 0);
}
},
});
@@ -215,7 +240,8 @@ export function AssistantList({ assistantIDs = [] }: AssistantListProps) {
placeholder={t("assistant.popover.search")}
className="w-full h-8 px-2 bg-transparent border rounded-md dark:border-white/10"
onChange={(event) => {
setKeyword(event.target.value.trim());
const value = specialCharacterFiltering(event.target.value.trim())
setKeyword(value);
}}
/>
</VisibleKey>

View File

@@ -80,7 +80,12 @@ const ChatAI = memo(
const { curChatEnd, setCurChatEnd, connected, setConnected } =
useChatStore();
const isTauri = useAppStore((state) => state.isTauri);
const isCurrentLogin = useAuthStore((state) => state.isCurrentLogin);
const setIsCurrentLogin = useAuthStore((state) => {
return state.setIsCurrentLogin;
});
const visibleStartPage = useConnectStore((state) => {
return state.visibleStartPage;
@@ -102,11 +107,27 @@ const ChatAI = memo(
const askAiServerId = useSearchStore((state) => {
return state.askAiServerId;
});
const currentService = useConnectStore((state) => {
return state.currentService;
});
useEffect(() => {
activeChatProp && setActiveChat(activeChatProp);
}, [activeChatProp]);
useEffect(() => {
if (!isTauri) return;
if (!currentService?.enabled) {
setActiveChat(void 0);
setIsCurrentLogin(false);
}
if (showChatHistory && connected) {
getChatHistory();
}
}, [currentService?.enabled, showChatHistory, connected]);
useEffect(() => {
if (askAiServerId || !askAiSessionId || chats.length === 0) return;
@@ -318,6 +339,7 @@ const ChatAI = memo(
(chatId: string, title: string) => {
setChats((prev) => {
const chatIndex = prev.findIndex((chat) => chat._id === chatId);
if (chatIndex === -1) return prev;
const modifiedChat = {
@@ -326,8 +348,8 @@ const ChatAI = memo(
};
const result = [...prev];
result.splice(chatIndex, 1);
return [modifiedChat, ...result];
result.splice(chatIndex, 1, modifiedChat);
return result;
});
if (activeChat?._id === chatId) {
@@ -372,29 +394,28 @@ const ChatAI = memo(
assistantIDs={assistantIDs}
/>
{isCurrentLogin ? (<>
<ChatContent
activeChat={activeChat}
curChatEnd={curChatEnd}
query_intent={query_intent}
tools={tools}
fetch_source={fetch_source}
pick_source={pick_source}
deep_read={deep_read}
think={think}
response={response}
loadingStep={loadingStep}
timedoutShow={timedoutShow}
Question={Question}
handleSendMessage={(value) =>
handleSendMessage(value, activeChat)
}
getFileUrl={getFileUrl}
/>
<Splash assistantIDs={assistantIDs} startPage={startPage}/>
</>
{isCurrentLogin ? (
<>
<ChatContent
activeChat={activeChat}
curChatEnd={curChatEnd}
query_intent={query_intent}
tools={tools}
fetch_source={fetch_source}
pick_source={pick_source}
deep_read={deep_read}
think={think}
response={response}
loadingStep={loadingStep}
timedoutShow={timedoutShow}
Question={Question}
handleSendMessage={(value) =>
handleSendMessage(value, activeChat)
}
getFileUrl={getFileUrl}
/>
<Splash assistantIDs={assistantIDs} startPage={startPage} />
</>
) : (
<ConnectPrompt />
)}

View File

@@ -57,6 +57,7 @@ export const ChatContent = ({
const { scrollToBottom } = useChatScroll(messagesEndRef);
const scrollRef = useRef<HTMLDivElement>(null);
const [isAtBottom, setIsAtBottom] = useState(true);
const visibleStartPage = useConnectStore((state) => state.visibleStartPage);
useEffect(() => {
setIsAtBottom(true);
@@ -100,7 +101,8 @@ export const ChatContent = ({
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 || activeChat?.messages?.length === 0) &&
!visibleStartPage && <Greetings />}
{activeChat?.messages?.map((message, index) => (
<ChatMessage

View File

@@ -39,8 +39,8 @@ export const ChatSidebar: React.FC<ChatSidebarProps> = ({
>
{isSidebarOpen && (
<HistoryList
id={HISTORY_PANEL_ID}
list={chats}
historyPanelId={HISTORY_PANEL_ID}
chats={chats}
active={activeChat}
onSearch={onSearch}
onRefresh={fetchChatHistory}

View File

@@ -76,6 +76,10 @@ export function ServerList({ reconnect, clearChat }: ServerListProps) {
[currentService?.id]
);
useEffect(() => {
fetchServers(true);
}, [currentService?.enabled]);
useEffect(() => {
if (!askAiServerId || serverList.length === 0) return;
@@ -180,7 +184,7 @@ export function ServerList({ reconnect, clearChat }: ServerListProps) {
<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
{t("assistant.chat.servers")}
</h3>
<div className="flex items-center gap-2">
<button
@@ -233,7 +237,8 @@ export function ServerList({ reconnect, clearChat }: ServerListProps) {
{server.name}
</div>
<div className="text-xs text-gray-500 dark:text-gray-400 truncate max-w-[200px]">
AI Assistant: {server.stats?.assistant_count || 1}
{t("assistant.chat.aiAssistant")}:{" "}
{server.stats?.assistant_count || 1}
</div>
</div>
</div>

View File

@@ -72,6 +72,12 @@ const Splash = ({ assistantIDs = [], startPage }: SplashProps) => {
fetchData();
}, [currentService?.id]);
useEffect(() => {
if (currentService?.enabled) return;
isTauri && setVisibleStartPage(false);
}, [currentService?.enabled]);
const settingsAssistantList = useMemo(() => {
return assistantList.filter((item) => {
return settings?.display_assistants?.includes(item?._source?.id);

View File

@@ -1,5 +1,4 @@
import { COPY_BUTTON_ID } from "@/constants";
import { useSearchStore } from "@/stores/searchStore";
import { useState } from "react";
import clsx from "clsx";
import {
Check,
@@ -9,7 +8,8 @@ import {
Volume2,
RotateCcw,
} from "lucide-react";
import { useState } from "react";
import { copyToClipboard } from "@/utils";
interface MessageActionsProps {
id: string;
@@ -17,6 +17,7 @@ interface MessageActionsProps {
question?: string;
actionClassName?: string;
actionIconSize?: number;
copyButtonId?: string;
onResend?: () => void;
}
@@ -28,6 +29,7 @@ export const MessageActions = ({
question,
actionClassName,
actionIconSize,
copyButtonId,
onResend,
}: MessageActionsProps) => {
const [copied, setCopied] = useState(false);
@@ -40,7 +42,7 @@ export const MessageActions = ({
const handleCopy = async () => {
try {
await navigator.clipboard.writeText(content);
await copyToClipboard(content);
setCopied(true);
const timerID = setTimeout(() => {
setCopied(false);
@@ -91,13 +93,12 @@ export const MessageActions = ({
}, 1000);
}
};
const goAskAi = useSearchStore((state) => state.goAskAi);
return (
<div className={clsx("flex items-center gap-1 mt-2", actionClassName)}>
{!isRefreshOnly && (
<button
id={goAskAi ? COPY_BUTTON_ID : ""}
id={copyButtonId}
onClick={handleCopy}
className="p-1 hover:bg-black/5 dark:hover:bg-white/5 rounded-lg transition-colors"
>

View File

@@ -12,7 +12,7 @@ export const UserMessage = ({ messageContent }: UserMessageProps) => {
return (
<div
className="flex gap-1 items-center"
className="flex gap-1 items-center justify-end"
onMouseEnter={() => setShowCopyButton(true)}
onMouseLeave={() => setShowCopyButton(false)}
>
@@ -24,7 +24,7 @@ export const UserMessage = ({ messageContent }: UserMessageProps) => {
<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"
className="max-w-[85%] overflow-auto text-left 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 user-select-text whitespace-pre-wrap"
onDoubleClick={(e) => {
const selection = window.getSelection();
const range = document.createRange();

View File

@@ -33,6 +33,7 @@ interface ChatMessageProps {
rootClassName?: string;
actionClassName?: string;
actionIconSize?: number;
copyButtonId?: string;
}
export const ChatMessage = memo(function ChatMessage({
@@ -51,6 +52,7 @@ export const ChatMessage = memo(function ChatMessage({
rootClassName,
actionClassName,
actionIconSize,
copyButtonId,
}: ChatMessageProps) {
const { t } = useTranslation();
@@ -65,16 +67,17 @@ export const ChatMessage = memo(function ChatMessage({
useEffect(() => {
if (assistant_item) {
setAssistant(assistant_item);
} else {
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);
return;
}
if (isAssistant && assistant_id && Array.isArray(assistantList)) {
setAssistant(
assistantList.find((item) => item._id === assistant_id) ?? {}
);
return;
}
setAssistant(currentAssistant);
}, [
isAssistant,
assistant_item,
@@ -91,7 +94,6 @@ 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);
@@ -152,6 +154,7 @@ export const ChatMessage = memo(function ChatMessage({
question={question}
actionClassName={actionClassName}
actionIconSize={actionIconSize}
copyButtonId={copyButtonId}
onResend={() => {
onResend && onResend(question);
}}
@@ -172,9 +175,6 @@ export const ChatMessage = memo(function ChatMessage({
className={clsx(
"py-8 flex",
[isAssistant ? "justify-start" : "justify-end"],
{
hidden: visibleStartPage,
},
rootClassName
)}
>

View File

@@ -2,6 +2,8 @@ import React, { useState } from "react";
import { ChevronLeft } from "lucide-react";
import { useTranslation } from "react-i18next";
import { specialCharacterFiltering } from "@/utils/index"
interface ConnectServiceProps {
setIsConnect: (isConnect: boolean) => void;
onAddServer: (endpoint: string) => void;
@@ -26,6 +28,11 @@ export function Connect({ setIsConnect, onAddServer }: ConnectServiceProps) {
setIsConnect(true);
};
const onChangeEndpoint = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = specialCharacterFiltering(e.target.value)
setEndpointLink(value)
}
return (
<div className="max-w-4xl">
<div className="flex items-center gap-2 mb-8">
@@ -60,7 +67,7 @@ export function Connect({ setIsConnect, onAddServer }: ConnectServiceProps) {
id="endpoint"
value={endpointLink}
placeholder={t("cloud.connect.serverPlaceholder")}
onChange={(e) => setEndpointLink(e.target.value)}
onChange={onChangeEndpoint}
className="text-[#101010] dark:text-white flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-gray-800"
/>
<button

View File

@@ -4,10 +4,7 @@ import { RefreshCcw } from "lucide-react";
import { DataSourceItem } from "./DataSourceItem";
import { useConnectStore } from "@/stores/connectStore";
import {
get_connectors_by_server,
datasource_search,
} from "@/commands";
import { get_connectors_by_server, datasource_search } from "@/commands";
export function DataSourcesList({ server }: { server: string }) {
const { t } = useTranslation();
@@ -17,8 +14,9 @@ export function DataSourcesList({ server }: { server: string }) {
const setDatasourceData = useConnectStore((state) => state.setDatasourceData);
const setConnectorData = useConnectStore((state) => state.setConnectorData);
function initServerAppData({ server }: { server: string }) {
//fetch datasource data
function initServerAppData() {
setRefreshLoading(true);
// fetch connectors data
get_connectors_by_server(server)
.then((res: any) => {
// console.log("get_connectors_by_server", res);
@@ -26,31 +24,20 @@ export function DataSourcesList({ server }: { server: string }) {
})
.finally(() => {});
//fetch datasource data
// fetch datasource data
datasource_search(server)
.then((res: any) => {
// console.log("datasource_search", res);
setDatasourceData(res, server);
})
.finally(() => {});
}
async function getDatasourceData() {
setRefreshLoading(true);
try {
initServerAppData({ server });
} finally {
setRefreshLoading(false);
}
.finally(() => {
setRefreshLoading(false);
});
}
useEffect(() => {
getDatasourceData();
}, []);
// const handleToggle = (id: string, enabled: boolean) => {
// console.log("handleToggle", id, enabled);
// };
initServerAppData();
}, [server]);
return (
<div className="space-y-4">
@@ -58,10 +45,12 @@ export function DataSourcesList({ server }: { server: string }) {
{t("cloud.dataSource.title")}
<button
className="p-2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-300 rounded-[6px] bg-white dark:bg-gray-800 border border-[rgba(228,229,239,1)] dark:border-gray-700"
onClick={() => getDatasourceData()}
onClick={() => initServerAppData()}
>
<RefreshCcw
className={`w-3.5 h-3.5 ${refreshLoading ? "animate-spin" : ""}`}
className={`w-3.5 h-3.5 transition-transform duration-1000 ${
refreshLoading ? "animate-spin" : ""
}`}
/>
</button>
</h2>

View File

@@ -1,4 +1,4 @@
import { memo, useCallback, useEffect, useState } from "react";
import { FC, memo, useCallback, useEffect, useState } from "react";
import { Copy } from "lucide-react";
import { useTranslation } from "react-i18next";
import { v4 as uuidv4 } from "uuid";
@@ -14,6 +14,7 @@ import { OpenURLWithBrowser } from "@/utils";
import { useConnectStore } from "@/stores/connectStore";
import { useAppStore } from "@/stores/appStore";
import { logout_coco_server, handle_sso_callback } from "@/commands";
import { copyToClipboard } from "@/utils";
interface ServiceAuthProps {
setRefreshLoading: (loading: boolean) => void;
@@ -30,7 +31,9 @@ const ServiceAuth = memo(
const addError = useAppStore((state) => state.addError);
const currentService = useConnectStore((state) => state.currentService);
const setCurrentService = useConnectStore((state) => state.setCurrentService);
const setCurrentService = useConnectStore(
(state) => state.setCurrentService
);
const serverList = useConnectStore((state) => state.serverList);
const setServerList = useConnectStore((state) => state.setServerList);
@@ -63,7 +66,7 @@ const ServiceAuth = memo(
emit("login_or_logout", false);
// update server profile
setCurrentService({ ...currentService, profile: null });
const updatedServerList = serverList.map(server =>
const updatedServerList = serverList.map((server) =>
server.id === id ? { ...server, profile: null } : server
);
console.log("updatedServerList", updatedServerList);
@@ -130,7 +133,6 @@ const ServiceAuth = memo(
// Fetch the initial deep link intent
useEffect(() => {
setLoading(false);
// Function to handle pasted URL
const handlePaste = (event: any) => {
const pastedText = event.clipboardData.getData("text").trim();
@@ -172,6 +174,10 @@ const ServiceAuth = memo(
};
}, [ssoRequestID]);
useEffect(() => {
setLoading(false);
}, [currentService]);
if (!currentService?.auth_provider?.sso?.url) {
return null;
}
@@ -197,7 +203,7 @@ const ServiceAuth = memo(
<LoadingState
onCancel={() => setLoading(false)}
onCopy={() => {
navigator.clipboard.writeText(
copyToClipboard(
`${currentService?.auth_provider?.sso?.url}/?provider=${currentService?.id}&product=coco&request_id=${ssoRequestID}`
);
}}
@@ -222,8 +228,14 @@ const ServiceAuth = memo(
export default ServiceAuth;
const LoginButton = memo(({ LoginClick }: { LoginClick: () => void }) => {
interface LoginButtonProps {
LoginClick: () => void;
}
const LoginButton: FC<LoginButtonProps> = memo((props) => {
const { LoginClick } = props;
const { t } = useTranslation();
return (
<button
className="px-6 py-2 bg-blue-500 text-white rounded-md hover:bg-blue-600 transition-colors mb-3"
@@ -235,27 +247,32 @@ const LoginButton = memo(({ LoginClick }: { LoginClick: () => void }) => {
);
});
const LoadingState = memo(
({ onCancel, onCopy }: { onCancel: () => void; onCopy: () => void }) => {
const { t } = useTranslation();
return (
<div className="flex items-center space-x-2">
<button
className="px-6 py-2 text-white bg-red-500 rounded-md hover:bg-red-600 transition-colors mb-3"
onClick={onCancel}
>
{t("cloud.cancel")}
</button>
<button
onClick={onCopy}
className="text-xl text-blue-500 hover:text-blue-600"
>
<Copy className="inline mr-2" />{" "}
</button>
<div className="text-justify italic text-xs">
{t("cloud.manualCopyLink")}
</div>
interface LoadingStateProps {
onCancel: () => void;
onCopy: () => void;
}
const LoadingState: FC<LoadingStateProps> = memo((props) => {
const { onCancel, onCopy } = props;
const { t } = useTranslation();
return (
<div className="flex items-center space-x-2">
<button
className="px-6 py-2 text-white bg-red-500 rounded-md hover:bg-red-600 transition-colors mb-3"
onClick={onCancel}
>
{t("cloud.cancel")}
</button>
<button
onClick={onCopy}
className="text-xl text-blue-500 hover:text-blue-600"
>
<Copy className="inline mr-2" />{" "}
</button>
<div className="text-justify italic text-xs">
{t("cloud.manualCopyLink")}
</div>
);
}
);
</div>
);
});

View File

@@ -1,6 +1,7 @@
import { User, LogOut } from "lucide-react";
import { UserProfile as UserInfo } from "@/types/server";
import { useState } from "react";
interface UserProfileProps {
server: string; //server's id
@@ -14,12 +15,21 @@ export function UserProfile({ server, userInfo, onLogout }: UserProfileProps) {
console.log("Logout", server);
};
const [imageLoadError, setImageLoadError] = useState(false);
return (
<div className="space-y-6">
<div className="flex items-center space-x-4">
<div className="w-12 h-12 bg-gray-100 dark:bg-gray-700 rounded-full flex items-center justify-center">
{userInfo?.avatar ? (
<img src={userInfo?.avatar} alt="" className="w-6 h-6" />
{userInfo?.avatar && !imageLoadError ? (
<img
src={userInfo?.avatar}
alt=""
className="w-6 h-6"
onError={() => {
setImageLoadError(true);
}}
/>
) : (
<User className="w-6 h-6 text-gray-500 dark:text-gray-400" />
)}

View File

@@ -1,6 +1,8 @@
import { useState } from "react";
import { Copy, Check } from "lucide-react";
import { copyToClipboard } from "@/utils";
interface CopyButtonProps {
textToCopy: string;
}
@@ -10,7 +12,7 @@ export const CopyButton = ({ textToCopy }: CopyButtonProps) => {
const handleCopy = async () => {
try {
await navigator.clipboard.writeText(textToCopy);
await copyToClipboard(textToCopy);
setCopied(true);
const timerID = setTimeout(() => {
setCopied(false);

View File

@@ -0,0 +1,86 @@
import {
Description,
Dialog,
DialogPanel,
DialogTitle,
} from "@headlessui/react";
import { useTranslation } from "react-i18next";
import VisibleKey from "@/components/Common/VisibleKey";
import { Chat } from "@/types/chat";
interface DeleteDialogProps {
isOpen: boolean;
active?: Chat;
setIsOpen: (isOpen: boolean) => void;
handleRemove: () => void;
}
const DeleteDialog = ({
isOpen,
active,
setIsOpen,
handleRemove,
}: DeleteDialogProps) => {
const { t } = useTranslation();
return (
<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>
);
};
export default DeleteDialog;

View File

@@ -0,0 +1,246 @@
import { FC, useCallback, useState, useEffect, useRef, useMemo } from "react";
import { useTranslation } from "react-i18next";
import { useKeyPress } from "ahooks";
import { debounce, groupBy, isNil } from "lodash-es";
import dayjs from "dayjs";
import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
import type { Chat } from "@/types/chat";
import NoDataImage from "../NoDataImage";
import DeleteDialog from "./DeleteDialog";
import HistoryListItem from "./HistoryListItem";
dayjs.extend(isSameOrAfter);
interface HistoryListContentProps {
chats: Chat[];
active?: Chat;
onSelect: (chat: Chat) => void;
onRename: (chatId: string, title: string) => void;
onRemove: (chatId: string) => void;
}
const HistoryListContent: FC<HistoryListContentProps> = ({
chats,
active,
onSelect,
onRename,
onRemove,
}) => {
const { t } = useTranslation();
const listRef = useRef<HTMLDivElement>(null);
const [isOpen, setIsOpen] = useState(false);
const [highlightId, setHighlightId] = useState<string>("");
const [highlightItem, setHighlightItem] = useState<Chat>({} as Chat);
const sortedList = useMemo(() => {
if (isNil(chats)) return {};
const now = dayjs();
return groupBy(chats, (chat) => {
const date = dayjs(chat._source?.created);
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");
});
}, [chats]);
// Flatten sorted list for navigation while keeping original structure for display
const flattenedChats = useMemo(() => {
return Object.values(sortedList).flat();
}, [sortedList]);
useKeyPress(["uparrow", "downarrow", "enter"], (_, key) => {
const currentIndex = flattenedChats.findIndex(
(chat) => chat._id === highlightId
);
const length = flattenedChats.length;
if (length === 0) return;
let nextIndex = currentIndex;
switch (key) {
case "uparrow":
nextIndex = currentIndex <= 0 ? length - 1 : currentIndex - 1;
setHighlightId(flattenedChats[nextIndex]._id);
break;
case "downarrow":
nextIndex = currentIndex >= length - 1 ? 0 : currentIndex + 1;
setHighlightId(flattenedChats[nextIndex]._id);
break;
case "enter":
if (document.activeElement instanceof HTMLTextAreaElement) {
return;
}
if (currentIndex >= 0) {
onSelect(flattenedChats[currentIndex]);
}
break;
}
});
const handleRemove = () => {
if (!highlightId) return;
onRemove(highlightId);
setIsOpen(false);
};
// Add ref for observer
const observerRef = useRef<IntersectionObserver | null>(null);
// Separate scroll handlers for keyboard and mouse
const scrollToElement = useCallback(
(elementId: string, isKeyboardNav: boolean) => {
if (!listRef.current) return;
const element = listRef.current.querySelector(`#${elementId}`);
if (!element) return;
// Check if element is in viewport
const rect = element.getBoundingClientRect();
const isVisible =
rect.top >= 0 &&
rect.bottom <=
(window.innerHeight || document.documentElement.clientHeight);
// Only scroll if element is not visible
if (!isVisible) {
element.scrollIntoView({
behavior: isKeyboardNav ? "smooth" : "auto",
block: isKeyboardNav ? "nearest" : "center",
});
}
},
[]
);
// Debounced scroll for mouse hover
const debouncedMouseScroll = useCallback(
debounce((elementId: string) => scrollToElement(elementId, false), 150),
[scrollToElement]
);
// Immediate scroll for keyboard navigation
const keyboardScroll = useCallback(
(elementId: string) => {
scrollToElement(elementId, true);
},
[scrollToElement]
);
// Setup intersection observer
useEffect(() => {
if (!listRef.current) return;
observerRef.current = new IntersectionObserver(
(entries) => {
entries.forEach((entry) => {
if (!entry.isIntersecting && entry.target.id === highlightId) {
scrollToElement(highlightId, false);
}
});
},
{ threshold: 0.5 }
);
return () => {
observerRef.current?.disconnect();
};
}, [scrollToElement]);
// Handle highlight changes
useEffect(() => {
if (!highlightId) return;
// Clear previous observations
observerRef.current?.disconnect();
const element = listRef.current?.querySelector(`#${highlightId}`);
if (element) {
observerRef.current?.observe(element);
}
const isKeyboardNav = document.activeElement?.tagName !== "LI";
if (isKeyboardNav) {
keyboardScroll(highlightId);
} else {
debouncedMouseScroll(highlightId);
}
return () => {
debouncedMouseScroll.cancel();
};
}, [highlightId, keyboardScroll, debouncedMouseScroll]);
const handleDelete = useCallback(() => {
if (!highlightId) return;
const currentIndex = flattenedChats.findIndex(
(chat) => chat._id === highlightId
);
setHighlightItem(flattenedChats[currentIndex]);
setIsOpen(true);
}, [highlightId]);
if (chats.length === 0) {
return (
<div className="flex items-center justify-center flex-1 pt-8">
<NoDataImage />
</div>
);
}
return (
<>
<div ref={listRef} className="py-4">
{Object.entries(sortedList).map(([label, list]) => (
<div key={label}>
<span className="text-xs text-[#999] px-3">{t(label)}</span>
<ul className="p-0">
{list.map((item) => (
<HistoryListItem
key={item._id}
item={item}
active={active}
onSelect={onSelect}
onRename={onRename}
onMouseEnter={() => setHighlightId(item._id)}
highlightId={highlightId}
handleDelete={handleDelete}
/>
))}
</ul>
</div>
))}
</div>
<DeleteDialog
isOpen={isOpen}
active={active || highlightItem}
setIsOpen={setIsOpen}
handleRemove={handleRemove}
/>
</>
);
};
export default HistoryListContent;

View File

@@ -0,0 +1,195 @@
import { FC, useRef, useCallback, useState } from "react";
import { Input, Popover, PopoverButton, PopoverPanel } from "@headlessui/react";
import { Ellipsis } from "lucide-react";
import clsx from "clsx";
import { useTranslation } from "react-i18next";
import { Pencil, Trash2 } from "lucide-react";
import type { Chat } from "@/types/chat";
import VisibleKey from "../VisibleKey";
import { specialCharacterFiltering } from "@/utils/index"
interface HistoryListItemProps {
item: Chat;
active?: Chat;
onSelect: (chat: Chat) => void;
onRename: (chatId: string, title: string) => void;
onMouseEnter: () => void;
handleDelete: () => void;
highlightId: string;
}
const HistoryListItem: FC<HistoryListItemProps> = ({
item,
active,
onSelect,
onRename,
onMouseEnter,
highlightId,
handleDelete,
}) => {
const { t } = useTranslation();
const moreButtonRef = useRef<HTMLButtonElement>(null);
const { _id, _source } = item;
const title = _source?.title ?? _id;
const isActive = item._id === active?._id || item._id === highlightId;
const [isEdit, setIsEdit] = useState(false);
const onContextMenu = useCallback(
(e: React.MouseEvent) => {
e.preventDefault();
e.stopPropagation();
moreButtonRef.current?.click();
},
[moreButtonRef.current]
);
const handleRename = useCallback(() => {
if (highlightId) {
setIsEdit(true);
}
}, [highlightId]);
const menuItems = [
// {
// label: "history_list.menu.share",
// icon: Share2,
// onClick: () => {},
// },
{
label: "history_list.menu.rename",
icon: Pencil,
shortcut: "R",
onClick: handleRename,
},
{
label: "history_list.menu.delete",
icon: Trash2,
shortcut: "D",
iconColor: "#FF2018",
onClick: handleDelete,
},
];
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);
}}
onMouseEnter={onMouseEnter}
onContextMenu={onContextMenu}
>
<div
className={clsx("w-1 h-6 rounded-sm bg-[#0072FF]", {
"opacity-0": item._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;
const value = specialCharacterFiltering(event.currentTarget.value)
onRename(item._id, value);
setIsEdit(false);
}}
onBlur={(event) => {
const value = specialCharacterFiltering(event.target.value)
onRename(item._id, 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>
);
};
export default HistoryListItem;

View File

@@ -1,39 +1,18 @@
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 { Input } from "@headlessui/react";
import { debounce } from "lodash-es";
import { FC, useMemo, useRef, useState } from "react";
import clsx from "clsx";
import {
Ellipsis,
PanelLeftClose,
Pencil,
RefreshCcw,
Search,
Trash2,
} from "lucide-react";
import { PanelLeftClose, RefreshCcw, Search } from "lucide-react";
import { useTranslation } from "react-i18next";
import VisibleKey from "../VisibleKey";
import { Chat } from "@/types/chat";
import NoDataImage from "../NoDataImage";
import { closeHistoryPanel } from "@/utils";
dayjs.extend(isSameOrAfter);
import { closeHistoryPanel, specialCharacterFiltering } from "@/utils";
import HistoryListContent from "./HistoryListContent";
interface HistoryListProps {
id?: string;
list: Chat[];
historyPanelId?: string;
chats: Chat[];
active?: Chat;
onSearch: (keyword: string) => void;
onRefresh: () => void;
@@ -44,8 +23,8 @@ interface HistoryListProps {
const HistoryList: FC<HistoryListProps> = (props) => {
const {
id,
list,
historyPanelId,
chats,
active,
onSearch,
onRefresh,
@@ -54,104 +33,13 @@ const HistoryList: FC<HistoryListProps> = (props) => {
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);
@@ -164,8 +52,7 @@ const HistoryList: FC<HistoryListProps> = (props) => {
return (
<div
ref={listRef}
id={id}
id={historyPanelId}
className={clsx(
"flex flex-col h-screen text-sm bg-[#F3F4F6] dark:bg-[#1F2937]"
)}
@@ -187,7 +74,9 @@ const HistoryList: FC<HistoryListProps> = (props) => {
className="w-full bg-transparent outline-none"
placeholder={t("history_list.search.placeholder")}
onChange={(event) => {
debouncedSearch(event.target.value);
const value = specialCharacterFiltering(event.target.value)
debouncedSearch(value);
}}
/>
</div>
@@ -207,218 +96,25 @@ const HistoryList: FC<HistoryListProps> = (props) => {
</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>
)}
<HistoryListContent
chats={chats}
active={active}
onSelect={onSelect}
onRename={onRename}
onRemove={onRemove}
/>
</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>
{historyPanelId && (
<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>
);
};

View File

@@ -1,5 +1,5 @@
import { useState } from "react";
import { isEmpty } from "lodash-es";
import { isNil, isEmpty } from "lodash-es";
import { useAsyncEffect } from "ahooks";
import { Box } from "lucide-react";
@@ -27,9 +27,6 @@ function CommonIcon({
const connectorSource = useFindConnectorIcon(item);
const [isAbsolute, setIsAbsolute] = useState<boolean>();
const [defaultIconState, setDefaultIconState] = useState<
React.FC | string | undefined
>(defaultIcon);
useAsyncEffect(async () => {
if (isEmpty(item)) return;
@@ -39,7 +36,6 @@ function CommonIcon({
omitSize: true,
});
setIsAbsolute(Boolean(isAbsolute));
setDefaultIconState(defaultIcon || Box);
} catch (error) {
setIsAbsolute(false);
}
@@ -47,6 +43,8 @@ function CommonIcon({
// Handle regular icon types
const renderIconByType = (renderType: string) => {
if (isNil(isAbsolute)) return null;
switch (renderType) {
case "special_icon": {
if (item.id === "Calculator") {
@@ -95,7 +93,7 @@ function CommonIcon({
case "default_icon":
return (
<UniversalIcon
defaultIcon={defaultIconState}
defaultIcon={defaultIcon || Box}
className={className}
onClick={onClick}
/>

View File

@@ -1,5 +1,6 @@
import { useAppStore } from "@/stores/appStore";
import logoImg from "@/assets/icon.svg";
import { FC } from "react";
interface FontIconProps {
name: string;
@@ -7,7 +8,7 @@ interface FontIconProps {
style?: React.CSSProperties;
}
const FontIcon = ({ name, className, style, ...rest }: FontIconProps) => {
const FontIcon: FC<FontIconProps> = ({ name, className, style, ...rest }) => {
const isTauri = useAppStore((state) => state.isTauri);
if (isTauri) {

View File

@@ -1,8 +1,9 @@
import { POPOVER_PANEL_SELECTOR } from "@/constants";
import { Input, InputProps } from "@headlessui/react";
import { useKeyPress } from "ahooks";
import { forwardRef, useImperativeHandle, useRef } from "react";
import { POPOVER_PANEL_SELECTOR } from "@/constants";
const PopoverInput = forwardRef<HTMLInputElement, InputProps>((props, ref) => {
const inputRef = useRef<HTMLInputElement>(null);

View File

@@ -5,6 +5,7 @@ import { last } from "lodash-es";
import { POPOVER_PANEL_SELECTOR } from "@/constants";
import { useShortcutsStore } from "@/stores/shortcutsStore";
import { useAppStore } from "@/stores/appStore";
interface VisibleKeyProps extends HTMLAttributes<HTMLDivElement> {
shortcut: string;
@@ -23,6 +24,8 @@ const VisibleKey: FC<VisibleKeyProps> = (props) => {
...rest
} = props;
const showTooltip = useAppStore((state) => state.showTooltip);
const modifierKey = useShortcutsStore((state) => {
return state.modifierKey;
});
@@ -82,11 +85,11 @@ const VisibleKey: FC<VisibleKeyProps> = (props) => {
<div
{...rest}
ref={childrenRef}
className={clsx(rootClassName, "relative inline-block")}
className={clsx(rootClassName, "relative inline-block leading-[100%]")}
>
{children}
{visibleShortcut ? (
{showTooltip && visibleShortcut ? (
<div
className={clsx(
"size-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] absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2",

View File

@@ -1,4 +1,4 @@
import { ChevronUp, Sparkles } from "lucide-react";
import { Sparkles, X } from "lucide-react";
import { FC, useState } from "react";
import clsx from "clsx";
import { useStreamChat } from "@/hooks/useStreamChat";
@@ -18,7 +18,6 @@ const AiOverview: FC<AiSummaryProps> = (props) => {
return state.aiOverviewAssistant;
});
const [expand, setExpand] = useState(true);
const [visible, setVisible] = useState(false);
const { isTyping, chunkData, loadingStep } = useStreamChat({
@@ -30,60 +29,58 @@ const AiOverview: FC<AiSummaryProps> = (props) => {
});
return (
<div
className={clsx(
"flex flex-col gap-2 relative max-h-[210px] px-4 py-3 rounded-[4px] text-[#333] dark:text-[#D8D8D8] bg-white dark:bg-[#141414] shadow-[0_4px_8px_rgba(0,0,0,0.1)] dark:shadow-[0_4px_20px_rgba(255,255,255,0.2)]",
{
"hidden -m-2": !visible,
}
)}
>
<div className={clsx({ "p-2": visible })}>
<div
className="absolute top-2 right-2 flex items-center justify-center size-[20px] border rounded-md cursor-pointer dark:border-[#282828]"
onClick={() => {
setExpand(!expand);
}}
className={clsx(
"flex flex-col gap-2 relative max-h-[210px] px-4 py-3 rounded-[4px] text-[#333] dark:text-[#D8D8D8] bg-white dark:bg-[#141414] shadow-[0_4px_8px_rgba(0,0,0,0.1)] dark:shadow-[0_4px_20px_rgba(255,255,255,0.2)]",
{
hidden: !visible,
}
)}
>
<ChevronUp className="size-4" />
</div>
<div className="flex item-center gap-1">
<Sparkles className="size-4 text-[#881c94]" />
<span className="text-xs font-semibold">AI Overview</span>
</div>
<div
className={clsx("flex-1 overflow-auto text-sm hide-scrollbar", {
hidden: !expand,
})}
>
<div className="-ml-11 -mr-4 user-select-text">
<ChatMessage
key="current"
hide_assistant
message={{
_id: "current",
_source: {
type: "assistant",
message: "",
question: "",
},
}}
{...chunkData}
isTyping={isTyping}
loadingStep={loadingStep}
rootClassName="!py-0"
actionClassName="absolute bottom-3 left-3 !m-0"
actionIconSize={12}
/>
<div
className="absolute top-2 right-2 flex items-center justify-center size-[20px] border rounded-md cursor-pointer dark:border-[#282828]"
onClick={() => {
setVisible(false);
}}
>
<X className="size-4" />
</div>
</div>
<div
className={clsx("min-h-[20px]", {
hidden: !expand || isTyping,
})}
/>
<div className="flex item-center gap-1">
<Sparkles className="size-4 text-[#881c94]" />
<span className="text-xs font-semibold">AI Overview</span>
</div>
<div className="flex-1 overflow-auto text-sm hide-scrollbar">
<div className="-ml-11 -mr-4 user-select-text">
<ChatMessage
key="current"
hide_assistant
message={{
_id: "current",
_source: {
type: "assistant",
message: "",
question: "",
},
}}
{...chunkData}
isTyping={isTyping}
loadingStep={loadingStep}
rootClassName="!py-0"
actionClassName="absolute bottom-3 left-3 !m-0"
actionIconSize={12}
/>
</div>
</div>
<div
className={clsx("min-h-[20px]", {
hidden: isTyping,
})}
/>
</div>
</div>
);
};

View File

@@ -9,17 +9,18 @@ import { useEffect, useRef, useState } from "react";
import { noop } from "lodash-es";
import { ChatMessage } from "../ChatMessage";
import { COPY_BUTTON_ID } from "@/constants";
import { useSearchStore } from "@/stores/searchStore";
import platformAdapter from "@/utils/platformAdapter";
import useMessageChunkData from "@/hooks/useMessageChunkData";
import { useAppStore } from "@/stores/appStore";
import { isMac } from "@/utils/platform";
import { useExtensionsStore } from "@/stores/extensionsStore";
import { useShortcutsStore } from "@/stores/shortcutsStore";
import { nanoid } from "nanoid";
interface State {
serverId?: string;
assistantId?: string;
copyButtonId?: string;
}
const AskAi = () => {
@@ -78,6 +79,7 @@ const AskAi = () => {
const setAskAiAssistantId = useSearchStore((state) => {
return state.setAskAiAssistantId;
});
const modifierKey = useShortcutsStore((state) => state.modifierKey);
useEffect(() => {
if (state.serverId) return;
@@ -116,11 +118,6 @@ const AskAi = () => {
return;
}
// If the chunk data does not contain a message_chunk, we ignore it
if (!chunkData.message_chunk) {
return;
}
setIsTyping(true);
setLoadingStep(() => ({
@@ -172,6 +169,8 @@ const AskAi = () => {
const { serverId, assistantId } = state;
state.copyButtonId = nanoid();
try {
await platformAdapter.invokeBackend("ask_ai", {
message: askAiMessage,
@@ -184,14 +183,13 @@ const AskAi = () => {
}
}, [askAiMessage]);
useKeyPress("enter", async (event) => {
const { metaKey, ctrlKey } = event;
useKeyPress(
`${modifierKey}.enter`,
async () => {
if (isTyping) return;
if (isTyping) return;
const { serverId, assistantId } = state;
const { serverId, assistantId } = state;
if ((isMac && metaKey) || (!isMac && ctrlKey)) {
await platformAdapter.commands("open_session_chat", {
serverId,
sessionId: sessionIdRef.current,
@@ -201,13 +199,26 @@ const AskAi = () => {
setAskAiServerId(serverId);
setAskAiSessionId(sessionIdRef.current);
return setAskAiAssistantId(assistantId);
setAskAiAssistantId(assistantId);
},
{
exactMatch: true,
}
);
const copyButton = document.getElementById(COPY_BUTTON_ID);
useKeyPress(
"enter",
() => {
if (isTyping || !state.copyButtonId) return;
copyButton?.click();
});
const copyButton = document.getElementById(state.copyButtonId);
copyButton?.click?.();
},
{
exactMatch: true,
}
);
return (
askAiMessage && (
@@ -238,6 +249,7 @@ const AskAi = () => {
think={think}
response={response}
loadingStep={loadingStep}
copyButtonId={state.copyButtonId}
/>
</div>
</div>

View File

@@ -10,12 +10,14 @@ import { useAppStore } from "@/stores/appStore";
interface AssistantManagerProps {
isChatMode: boolean;
inputValue: string;
handleSubmit: () => void;
changeInput: (value: string) => void;
}
export function useAssistantManager({
isChatMode,
inputValue,
handleSubmit,
changeInput,
}: AssistantManagerProps) {
@@ -56,21 +58,23 @@ export function useAssistantManager({
}
}, [askAI]);
const handleAskAi = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
const handleAskAi = () => {
if (!isTauri) return;
askAIRef.current = cloneDeep(askAI);
if (!askAIRef.current) return;
event.preventDefault();
let value = inputValue.trim();
const { value } = event.currentTarget;
if (isEmpty(value)) return;
if (!selectedAssistant && isEmpty(value)) return;
if (!goAskAi && selectedAssistant) {
value = "";
}
changeInput("");
setAskAiMessage(!goAskAi && selectedAssistant ? "" : value);
setAskAiMessage(value);
setGoAskAi(true);
};
@@ -85,18 +89,25 @@ export function useAssistantManager({
return setGoAskAi(false);
}
if (key === "Tab" && !isChatMode && isTauri) {
if (key === "Tab" && isTauri) {
e.preventDefault();
if (isChatMode) {
return;
}
assistant_get();
return handleAskAi(e);
return handleAskAi();
}
if (key === "Enter" && !shiftKey && !isChatMode && isTauri) {
e.preventDefault();
if (goAskAi) {
return handleAskAi(e);
return handleAskAi();
}
e.preventDefault();
handleSubmit();
}
};

View File

@@ -5,14 +5,18 @@ import {
forwardRef,
KeyboardEvent,
useEffect,
useCallback,
} from "react";
import { useTranslation } from "react-i18next";
import { specialCharacterFiltering } from "@/utils/index";
const LINE_HEIGHT = 24; // 1.5rem
const MAX_FIRST_LINE_WIDTH = 470; // Width in pixels for first line
const MAX_HEIGHT = 240; // 15rem
interface AutoResizeTextareaProps {
isChatMode: boolean;
input: string;
setInput: (value: string) => void;
handleKeyDown?: (e: React.KeyboardEvent<HTMLTextAreaElement>) => void;
@@ -28,6 +32,7 @@ const AutoResizeTextarea = forwardRef<
>(
(
{
isChatMode,
input,
setInput,
handleKeyDown,
@@ -130,9 +135,18 @@ const AutoResizeTextarea = forwardRef<
handleKeyDown?.(event);
};
const handleChange = useCallback(
(e: React.ChangeEvent<HTMLTextAreaElement>) => {
const value = specialCharacterFiltering(e.target.value);
setInput(value);
},
[setInput]
);
return (
<textarea
ref={textareaRef}
id={isChatMode ? "chat-textarea" : "search-textarea"}
autoFocus
autoComplete="off"
autoCapitalize="none"
@@ -141,7 +155,7 @@ const AutoResizeTextarea = forwardRef<
placeholder={chatPlaceholder || t("search.textarea.placeholder")}
aria-label={t("search.textarea.ariaLabel")}
value={input}
onChange={(e) => setInput(e.target.value)}
onChange={handleChange}
onKeyDown={handleKeyPress}
onCompositionStart={setTrue}
onCompositionEnd={() => {

View File

@@ -28,7 +28,7 @@ const ChatIcons: React.FC<ChatIconsProps> = ({
<button
className={`ml-1 p-1 ${
inputValue ? "bg-[#0072FF]" : "bg-[#E4E5F0] dark:bg-[rgb(84,84,84)]"
} rounded-full transition-colors`}
} rounded-full transition-colors h-6`}
type="submit"
onClick={() => onSend(inputValue.trim())}
>

View File

@@ -4,14 +4,14 @@ import { isNil, lowerCase, noop } from "lodash-es";
import { Copy, Link, SquareArrowOutUpRight } from "lucide-react";
import { cloneElement, FC, useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { Input } from "@headlessui/react";
import { useOSKeyPress } from "@/hooks/useOSKeyPress";
import { useSearchStore } from "@/stores/searchStore";
import { copyToClipboard, OpenURLWithBrowser } from "@/utils";
import { copyToClipboard, specialCharacterFiltering } from "@/utils";
import { isMac } from "@/utils/platform";
import { CONTEXT_MENU_PANEL_ID } from "@/constants";
import { useShortcutsStore } from "@/stores/shortcutsStore";
import { Input } from "@headlessui/react";
import VisibleKey from "../Common/VisibleKey";
import platformAdapter from "@/utils/platformAdapter";
@@ -19,9 +19,7 @@ interface State {
activeMenuIndex: number;
}
interface ContextMenuProps {
hideCoco?: () => void;
}
interface ContextMenuProps {}
const ContextMenu: FC<ContextMenuProps> = () => {
const containerRef = useRef<HTMLDivElement>(null);
@@ -53,7 +51,7 @@ const ContextMenu: FC<ContextMenuProps> = () => {
const menus = useCreation(() => {
if (isNil(selectedSearchContent)) return [];
const { url, category, payload, on_opened } = selectedSearchContent;
const { url, category, type, payload } = selectedSearchContent;
const { query, result } = payload ?? {};
if (category === "AI Overview") {
@@ -70,15 +68,7 @@ const ContextMenu: FC<ContextMenuProps> = () => {
shortcut: "enter",
hide: category === "Calculator",
clickEvent: () => {
if (on_opened) {
return platformAdapter.invokeBackend("open", {
onOpened: on_opened,
});
}
if (url) {
OpenURLWithBrowser(url);
}
platformAdapter.openSearchItem(selectedSearchContent as any);
},
},
{
@@ -86,7 +76,7 @@ const ContextMenu: FC<ContextMenuProps> = () => {
icon: <Link />,
keys: isMac ? ["⌘", "L"] : ["Ctrl", "L"],
shortcut: isMac ? "meta.l" : "ctrl.l",
hide: category === "Calculator",
hide: category === "Calculator" || type === "AI Assistant",
clickEvent() {
copyToClipboard(url);
},
@@ -280,7 +270,7 @@ const ContextMenu: FC<ContextMenuProps> = () => {
placeholder={t("search.contextMenu.search")}
className="w-full bg-transparent"
onChange={(event) => {
const value = event.target.value;
const value = specialCharacterFiltering(event.target.value);
const searchMenus = menus.filter((item) => {
return lowerCase(item.name).includes(lowerCase(value));

View File

@@ -11,7 +11,6 @@ import platformAdapter from "@/utils/platformAdapter";
import { Get } from "@/api/axiosRequest";
import { useAppStore } from "@/stores/appStore";
import { useConnectStore } from "@/stores/connectStore";
import { OpenURLWithBrowser } from "@/utils";
interface DocumentListProps {
onSelectDocument: (id: string) => void;
@@ -141,11 +140,15 @@ export const DocumentList: React.FC<DocumentListProps> = ({
setIsKeyboardMode(false);
}, [isChatMode, input]);
const { visibleContextMenu } = useSearchStore();
const handleKeyDown = useCallback(
(e: KeyboardEvent) => {
if (!data?.list?.length) return;
const handleArrowKeys = () => {
if (visibleContextMenu) return;
e.preventDefault();
setIsKeyboardMode(true);
@@ -170,15 +173,8 @@ export const DocumentList: React.FC<DocumentListProps> = ({
const handleEnter = () => {
if (selectedItem === null) return;
const item = data.list[selectedItem]?.document;
if (item?.on_opened) {
return platformAdapter.invokeBackend("open", {
onOpened: item.on_opened,
});
}
if (item?.url) {
OpenURLWithBrowser(item.url);
}
platformAdapter.openSearchItem(item);
};
switch (e.key) {
@@ -237,20 +233,12 @@ export const DocumentList: React.FC<DocumentListProps> = ({
<SearchListItem
key={hit.document.id + index}
itemRef={(el) => (itemRefs.current[index] = el)}
item={hit.document}
item={{ ...hit.document, querySource: hit.source }}
isSelected={selectedItem === index}
currentIndex={index}
onMouseEnter={() => onMouseEnter(index, hit.document)}
onItemClick={() => {
if (hit.document?.on_opened) {
return platformAdapter.invokeBackend("open", {
onOpened: hit.document.on_opened,
});
}
if (hit.document?.url) {
OpenURLWithBrowser(hit.document.url);
}
platformAdapter.openSearchItem(hit.document);
}}
showListRight={viewMode === "list"}
/>

View File

@@ -6,7 +6,7 @@ import {
MouseEvent,
useMemo,
} from "react";
import { useDebounceFn, useUnmount } from "ahooks";
import { useDebounceFn } from "ahooks";
import { useTranslation } from "react-i18next";
import { useSearchStore } from "@/stores/searchStore";
@@ -16,7 +16,6 @@ import { useKeyboardNavigation } from "@/hooks/useKeyboardNavigation";
import { SearchSource } from "./SearchSource";
import DropdownListItem from "./DropdownListItem";
import platformAdapter from "@/utils/platformAdapter";
import { OpenURLWithBrowser } from "@/utils";
type ISearchData = Record<string, QueryHits[]>;
@@ -44,12 +43,8 @@ function DropdownList({
const [selectedName, setSelectedName] = useState<string>("");
const [showIndex, setShowIndex] = useState<boolean>(false);
const {
setSourceData,
setSelectedSearchContent,
setSelectedAssistant,
setVisibleContextMenu,
} = useSearchStore();
const { setSourceData, setSelectedSearchContent, setVisibleContextMenu } =
useSearchStore();
const showSource = useMemo(
() => Object.keys(searchData).length < 5,
@@ -82,15 +77,7 @@ function DropdownList({
setSelectedSearchContent(item);
},
onItemClick: (item: SearchDocument) => {
if (item?.on_opened) {
return platformAdapter.invokeBackend("open", {
onOpened: item.on_opened,
});
}
if (item?.url) {
OpenURLWithBrowser(item.url);
}
platformAdapter.openSearchItem(item);
},
goToTwoPage: (item: SearchDocument) => {
setSourceData(item);
@@ -98,11 +85,6 @@ function DropdownList({
};
}, []);
useUnmount(() => {
setSelectedIndex(null);
setSelectedSearchContent(undefined);
});
useEffect(() => {
if (selectedIndex === null) {
setSelectedSearchContent(undefined);
@@ -111,14 +93,6 @@ function DropdownList({
const item = globalItemIndexMap[selectedIndex];
setSelectedSearchContent(item);
if (item?.source?.id === "assistant") {
setSelectedAssistant({
...item,
name: item.title,
});
} else {
setSelectedAssistant(undefined);
}
}, [selectedIndex]);
// Scroll selected item into view
@@ -150,6 +124,13 @@ function DropdownList({
initializeSelection();
}, [searchData]);
useEffect(() => {
return () => {
setSelectedIndex(null);
setSelectedSearchContent(undefined);
};
}, []);
// Keyboard navigation
useKeyboardNavigation({
suggests,

View File

@@ -47,6 +47,7 @@ const DropdownListItem = memo(
id={`search-item-${currentIndex}`}
className={clsx("p-2 transition rounded-lg", {
"bg-[#EDEDED] dark:bg-[#202126]": isSelected,
"!p-0": isAiOverview,
})}
>
{isCalculator && <Calculator item={item} isSelected={isSelected} />}

View File

@@ -46,7 +46,6 @@ interface ChatInputProps {
}) => Promise<string | string[] | null>;
getFileMetadata: (path: string) => Promise<any>;
getFileIcon: (path: string, size: number) => Promise<string>;
hideCoco?: () => void;
hasModules?: string[];
searchPlaceholder?: string;
chatPlaceholder?: string;
@@ -78,7 +77,6 @@ export default function ChatInput({
const currentAssistant = useConnectStore((state) => state.currentAssistant);
// const sessionId = useConnectStore((state) => state.currentSessionId);
const showTooltip = useAppStore((state) => state.showTooltip);
const setBlurred = useAppStore((state) => state.setBlurred);
const isTauri = useAppStore((state) => state.isTauri);
@@ -86,6 +84,9 @@ export default function ChatInput({
const { modifierKey, returnToInput, setModifierKeyPressed } =
useShortcutsStore();
const language = useAppStore((state) => {
return state.language;
});
useEffect(() => {
return () => {
@@ -126,7 +127,6 @@ export default function ChatInput({
useKeyboardHandlers({
isChatMode,
handleSubmit,
disabledChange,
curChatEnd,
});
@@ -159,6 +159,7 @@ export default function ChatInput({
const { askAI, askAIRef, assistantDetail, handleKeyDownAutoResizeTextarea } =
useAssistantManager({
isChatMode,
inputValue,
handleSubmit,
changeInput,
});
@@ -183,6 +184,18 @@ export default function ChatInput({
return state.disabledExtensions;
});
const akiAiTooltipPrefix = useMemo(() => {
if (language === "zh") {
if (/^[a-zA-Z]/.test(askAI?.name)) {
return "问 ";
}
return "问";
}
return "Ask";
}, [language, askAI]);
const renderSearchIcon = () => (
<SearchIcons
lineCount={lineCount}
@@ -202,7 +215,7 @@ export default function ChatInput({
disabledChange={disabledChange}
/>
{showTooltip && !isChatMode && sourceData && (
{!isChatMode && sourceData && (
<div
className={`absolute ${
lineCount === 1 ? "-top-[5px]" : "top-[calc(100%-25px)]"
@@ -212,7 +225,7 @@ export default function ChatInput({
</div>
)}
{/* {showTooltip && (
{/*
<div
className={clsx(
`absolute ${
@@ -225,7 +238,7 @@ export default function ChatInput({
>
<VisibleKey shortcut={returnToInput} />
</div>
)} */}
*/}
{!isChatMode &&
isTauri &&
@@ -235,7 +248,7 @@ export default function ChatInput({
<div className="flex items-center gap-2 text-sm text-[#AEAEAE] dark:text-[#545454] whitespace-nowrap">
<span>
{t("search.askCocoAi.title", {
replace: [askAI.name],
replace: [akiAiTooltipPrefix, askAI.name],
})}
</span>
<div className="flex items-center justify-center w-8 h-[20px] text-xs rounded-md border border-black/10 dark:border-[#545454]">
@@ -251,7 +264,7 @@ export default function ChatInput({
}}
/> */}
{showTooltip && isChatMode && (
{isChatMode && curChatEnd && (
<div
className={`absolute ${
lineCount === 1 ? "-top-[5px]" : "top-[calc(100%-30px)]"
@@ -275,6 +288,7 @@ export default function ChatInput({
>
<AutoResizeTextarea
ref={textareaRef}
isChatMode={isChatMode}
input={inputValue}
setInput={handleInputChange}
handleKeyDown={handleKeyDownAutoResizeTextarea}
@@ -329,7 +343,6 @@ export default function ChatInput({
setIsDeepThinkActive={setIsDeepThinkActive}
isMCPActive={isMCPActive}
setIsMCPActive={setIsMCPActive}
showTooltip={showTooltip}
changeMode={changeMode}
/>
</div>

View File

@@ -31,7 +31,6 @@ interface InputControlsProps {
hasModules?: string[];
searchPlaceholder?: string;
chatPlaceholder?: string;
showTooltip?: boolean;
changeMode?: (isChatMode: boolean) => void;
}
@@ -45,7 +44,6 @@ const InputControls = ({
setIsMCPActive,
isChatPage,
hasModules,
showTooltip,
changeMode,
}: InputControlsProps) => {
const { t } = useTranslation();
@@ -78,14 +76,6 @@ const InputControls = ({
query?: string;
}
): Promise<DataSource[]> => {
if (
!(
assistantConfig.datasourceEnabled && assistantConfig.datasourceVisible
)
) {
return [];
}
const body: Record<string, any> = {
id: serverId,
from: options?.from || 0,
@@ -119,6 +109,7 @@ const InputControls = ({
options: body,
});
} else {
body.id = undefined;
const [error, res]: any = await Post("/datasource/_search", body);
if (error) {
console.error("_search", error);
@@ -150,9 +141,6 @@ const InputControls = ({
query?: string;
}
): Promise<DataSource[]> => {
if (!(assistantConfig.mcpEnabled && assistantConfig.mcpVisible)) {
return [];
}
const body: Record<string, any> = {
id: serverId,
from: options?.from || 0,
@@ -185,6 +173,7 @@ const InputControls = ({
body
);
} else {
body.id = undefined;
const [error, res]: any = await Post("/mcp_server/_search", body);
if (error) {
console.error("_search", error);
@@ -222,6 +211,7 @@ const InputControls = ({
const aiOverviewAssistant = useExtensionsStore((state) => {
return state.aiOverviewAssistant;
});
const aiOverviewShortcut = useShortcutsStore((state) => state.aiOverview);
return (
<div
@@ -259,18 +249,16 @@ const InputControls = ({
onKeyPress={setIsDeepThinkActive}
>
<Brain
className={`size-3 ${
isDeepThinkActive
? "text-[#0072FF] dark:text-[#0072FF]"
: "text-[#333] dark:text-white"
}`}
className={`size-3 ${isDeepThinkActive
? "text-[#0072FF] dark:text-[#0072FF]"
: "text-[#333] dark:text-white"
}`}
/>
</VisibleKey>
{isDeepThinkActive && (
<span
className={`${
isDeepThinkActive ? "text-[#0072FF]" : "dark:text-white"
}`}
className={`${isDeepThinkActive ? "text-[#0072FF]" : "dark:text-white"
}`}
>
{t("search.input.deepThink")}
</span>
@@ -278,25 +266,23 @@ const InputControls = ({
</button>
)}
{source?.datasource?.enabled && source?.datasource?.visible && (
<SearchPopover
isSearchActive={isSearchActive}
setIsSearchActive={setIsSearchActive}
getDataSourcesByServer={getDataSourcesByServer}
/>
)}
<SearchPopover
datasource={source?.datasource}
isSearchActive={isSearchActive}
setIsSearchActive={setIsSearchActive}
getDataSourcesByServer={getDataSourcesByServer}
/>
{source?.mcp_servers?.enabled && source?.mcp_servers?.visible && (
<MCPPopover
isMCPActive={isMCPActive}
setIsMCPActive={setIsMCPActive}
getMCPByServer={getMCPByServer}
/>
)}
<MCPPopover
mcp_servers={source?.mcp_servers}
isMCPActive={isMCPActive}
setIsMCPActive={setIsMCPActive}
getMCPByServer={getMCPByServer}
/>
{!(source?.datasource?.enabled && source?.datasource?.visible) &&
(source?.type !== "deep_think" || !source?.config?.visible) &&
!(source?.mcp_servers?.enabled && source?.mcp_servers?.visible) ? (
(source?.type !== "deep_think" || !source?.config?.visible) &&
!(source?.mcp_servers?.enabled && source?.mcp_servers?.visible) ? (
<div className="px-[9px]">
<Copyright />
</div>
@@ -324,7 +310,15 @@ const InputControls = ({
setEnabledAiOverview(!enabledAiOverview);
}}
>
<Sparkles className="size-4" />
<VisibleKey
shortcut={aiOverviewShortcut}
onKeyPress={() => {
setEnabledAiOverview(!enabledAiOverview);
}}
>
<Sparkles className="size-4" />
</VisibleKey>
<span
className={clsx("text-xs", { hidden: !enabledAiOverview })}
>
@@ -337,16 +331,14 @@ const InputControls = ({
{isChatPage || hasModules?.length !== 2 ? null : (
<div className="relative w-16 flex justify-end items-center">
{showTooltip && (
<div className="absolute right-[52px] -top-2 z-10">
<VisibleKey
shortcut={modeSwitch}
onKeyPress={() => {
changeMode && changeMode(!isChatMode);
}}
/>
</div>
)}
<div className="absolute right-[52px] -top-2 z-10">
<VisibleKey
shortcut={modeSwitch}
onKeyPress={() => {
changeMode && changeMode(!isChatMode);
}}
/>
</div>
<ChatSwitch
isChatMode={isChatMode}

View File

@@ -16,8 +16,10 @@ import { useChatStore } from "@/stores/chatStore";
import NoDataImage from "@/components/Common/NoDataImage";
import PopoverInput from "@/components/Common/PopoverInput";
import Pagination from "@/components/Common/Pagination";
import { specialCharacterFiltering } from "@/utils"
interface MCPPopoverProps {
mcp_servers: any;
isMCPActive: boolean;
setIsMCPActive: () => void;
getMCPByServer: (
@@ -31,6 +33,7 @@ interface MCPPopoverProps {
}
export default function MCPPopover({
mcp_servers,
isMCPActive,
setIsMCPActive,
getMCPByServer,
@@ -44,6 +47,7 @@ export default function MCPPopover({
const MCPIds = useSearchStore((state) => state.MCPIds);
const setMCPIds = useSearchStore((state) => state.setMCPIds);
const currentAssistant = useConnectStore((state) => state.currentAssistant);
const currentService = useConnectStore((state) => state.currentService);
const [keyword, setKeyword] = useState("");
@@ -65,12 +69,12 @@ export default function MCPPopover({
}
const data = res?.length
? [
{
id: "all",
name: "search.input.searchPopover.allScope",
},
...res,
]
{
id: "all",
name: "search.input.searchPopover.allScope",
},
...res,
]
: [];
setDataList(data);
@@ -98,7 +102,7 @@ export default function MCPPopover({
useEffect(() => {
connected && getDataSourceList();
}, [connected, currentService?.id, debouncedKeyword]);
}, [connected, currentService?.id, debouncedKeyword, currentAssistant]);
useEffect(() => {
setTotalPage(Math.max(Math.ceil(dataList.length / 10), 1));
@@ -161,6 +165,10 @@ export default function MCPPopover({
setPage(page + 1);
};
if (!(mcp_servers?.enabled && mcp_servers?.visible)) {
return null
}
return (
<div
className={clsx(
@@ -173,11 +181,10 @@ export default function MCPPopover({
>
<VisibleKey shortcut={mcpSearch} onKeyPress={setIsMCPActive}>
<Hammer
className={`size-3 ${
isMCPActive
? "text-[#0072FF] dark:text-[#0072FF]"
: "text-[#333] dark:text-white"
}`}
className={`size-3 ${isMCPActive
? "text-[#0072FF] dark:text-[#0072FF]"
: "text-[#333] dark:text-white"
}`}
/>
</VisibleKey>
@@ -224,9 +231,8 @@ export default function MCPPopover({
>
<VisibleKey shortcut="R" onKeyPress={handleRefresh}>
<RefreshCw
className={`size-3 text-[#0287FF] transition-transform duration-1000 ${
isRefreshDataSource ? "animate-spin" : ""
}`}
className={`size-3 text-[#0287FF] transition-transform duration-1000 ${isRefreshDataSource ? "animate-spin" : ""
}`}
/>
</VisibleKey>
</div>
@@ -245,10 +251,12 @@ export default function MCPPopover({
<PopoverInput
autoFocus
value={keyword}
ref={searchInputRef}
className="size-full px-2 rounded-lg border dark:border-white/10 bg-transparent"
onChange={(e) => {
setKeyword(e.target.value);
const value = specialCharacterFiltering(e.target.value.trim())
setKeyword(value);
}}
/>
</div>

View File

@@ -33,6 +33,19 @@ const SearchResultsPanel = memo<{
}
}, [input, isChatMode, performSearch, sourceData]);
const { setSelectedAssistant, selectedSearchContent } = useSearchStore();
useEffect(() => {
if (selectedSearchContent?.type === "AI Assistant") {
setSelectedAssistant({
...selectedSearchContent,
name: selectedSearchContent.title,
});
} else {
setSelectedAssistant(void 0);
}
}, [selectedSearchContent]);
if (goAskAi) return <AskAi />;
if (suggests.length === 0) return <NoResults />;
@@ -54,11 +67,10 @@ interface SearchProps {
changeInput: (val: string) => void;
isChatMode: boolean;
input: string;
hideCoco?: () => void;
setIsPinned?: (value: boolean) => void;
}
function Search({ isChatMode, input, hideCoco, setIsPinned }: SearchProps) {
function Search({ isChatMode, input, setIsPinned }: SearchProps) {
const mainWindowRef = useRef<HTMLDivElement>(null);
return (
@@ -67,7 +79,7 @@ function Search({ isChatMode, input, hideCoco, setIsPinned }: SearchProps) {
<Footer setIsPinnedWeb={setIsPinned} />
<ContextMenu hideCoco={hideCoco} />
<ContextMenu />
</div>
);
}

View File

@@ -1,4 +1,4 @@
import React from "react";
import React, { MouseEvent } from "react";
import clsx from "clsx";
import { File } from "lucide-react";
@@ -7,6 +7,7 @@ import ListRight from "./ListRight";
import { useAppStore } from "@/stores/appStore";
import { useIsMobile } from "@/hooks/useIsMobile";
import type { SearchDocument } from "@/types/search";
import { useSearchStore } from "@/stores/searchStore";
interface SearchListItemProps {
item: SearchDocument;
@@ -36,10 +37,23 @@ const SearchListItem: React.FC<SearchListItemProps> = React.memo(
const isMobile = useIsMobile();
const { setSelectedSearchContent, setVisibleContextMenu } =
useSearchStore();
const handleContextMenu = (event: MouseEvent) => {
event.preventDefault();
setVisibleContextMenu(true);
};
return (
<div
ref={itemRef}
onMouseEnter={onMouseEnter}
onMouseEnter={() => {
setSelectedSearchContent(item);
onMouseEnter();
}}
onClick={onItemClick}
className={clsx(
"w-full px-2 py-2.5 text-sm flex mb-0 flex-row items-center mobile:mb-2 mobile:flex-col mobile:items-start justify-between rounded-lg transition-colors cursor-pointer text-[#333] dark:text-[#d8d8d8]",
@@ -51,6 +65,7 @@ const SearchListItem: React.FC<SearchListItemProps> = React.memo(
role="option"
aria-selected={isSelected}
id={`search-item-${currentIndex}`}
onContextMenu={handleContextMenu}
>
<div
className={`${
@@ -60,7 +75,12 @@ const SearchListItem: React.FC<SearchListItemProps> = React.memo(
} min-w-0 flex gap-2 items-center justify-start `}
>
<CommonIcon
renderOrder={["special_icon", "item_icon", "connector_icon", "default_icon"]}
renderOrder={[
"special_icon",
"item_icon",
"connector_icon",
"default_icon",
]}
item={item}
itemIcon={item?.icon}
defaultIcon={File}

View File

@@ -16,8 +16,10 @@ import { useChatStore } from "@/stores/chatStore";
import NoDataImage from "@/components/Common/NoDataImage";
import PopoverInput from "@/components/Common/PopoverInput";
import Pagination from "@/components/Common/Pagination";
import { specialCharacterFiltering } from "@/utils"
interface SearchPopoverProps {
datasource: any;
isSearchActive: boolean;
setIsSearchActive: () => void;
getDataSourcesByServer: (
@@ -31,6 +33,7 @@ interface SearchPopoverProps {
}
export default function SearchPopover({
datasource,
isSearchActive,
setIsSearchActive,
getDataSourcesByServer,
@@ -44,6 +47,7 @@ export default function SearchPopover({
const sourceDataIds = useSearchStore((state) => state.sourceDataIds);
const setSourceDataIds = useSearchStore((state) => state.setSourceDataIds);
const currentAssistant = useConnectStore((state) => state.currentAssistant);
const currentService = useConnectStore((state) => state.currentService);
const [keyword, setKeyword] = useState("");
@@ -68,12 +72,12 @@ export default function SearchPopover({
}
const data = res?.length
? [
{
id: "all",
name: "search.input.searchPopover.allScope",
},
...res,
]
{
id: "all",
name: "search.input.searchPopover.allScope",
},
...res,
]
: [];
setDataSourceList(data);
@@ -101,7 +105,7 @@ export default function SearchPopover({
useEffect(() => {
connected && getDataSourceList();
}, [connected, currentService?.id, debouncedKeyword]);
}, [connected, currentService?.id, debouncedKeyword, currentAssistant]);
useEffect(() => {
setTotalPage(Math.max(Math.ceil(dataSourceList.length / 10), 1));
@@ -164,6 +168,10 @@ export default function SearchPopover({
setPage(page + 1);
};
if (!(datasource?.enabled && datasource?.visible)) {
return null
}
return (
<div
className={clsx(
@@ -176,20 +184,18 @@ export default function SearchPopover({
>
<VisibleKey shortcut={internetSearch} onKeyPress={setIsSearchActive}>
<Globe
className={`size-3 ${
isSearchActive
? "text-[#0072FF] dark:text-[#0072FF]"
: "text-[#333] dark:text-white"
}`}
className={`size-3 ${isSearchActive
? "text-[#0072FF] dark:text-[#0072FF]"
: "text-[#333] dark:text-white"
}`}
/>
</VisibleKey>
{isSearchActive && (
<>
<span
className={`${
isSearchActive ? "text-[#0072FF]" : "dark:text-white"
}`}
className={`${isSearchActive ? "text-[#0072FF]" : "dark:text-white"
}`}
>
{t("search.input.search")}
</span>
@@ -229,9 +235,8 @@ export default function SearchPopover({
>
<VisibleKey shortcut="R" onKeyPress={handleRefresh}>
<RefreshCw
className={`size-3 text-[#0287FF] transition-transform duration-1000 ${
isRefreshDataSource ? "animate-spin" : ""
}`}
className={`size-3 text-[#0287FF] transition-transform duration-1000 ${isRefreshDataSource ? "animate-spin" : ""
}`}
/>
</VisibleKey>
</div>
@@ -250,10 +255,12 @@ export default function SearchPopover({
<PopoverInput
autoFocus
value={keyword}
ref={searchInputRef}
className="size-full px-2 rounded-lg border dark:border-white/10 bg-transparent"
onChange={(e) => {
setKeyword(e.target.value);
const value = specialCharacterFiltering(e.target.value.trim())
setKeyword(value);
}}
/>
</div>

View File

@@ -6,6 +6,7 @@ import {
Suspense,
memo,
useState,
useMemo,
} from "react";
import clsx from "clsx";
import { useMount } from "ahooks";
@@ -36,7 +37,6 @@ interface SearchChatProps {
searchPlaceholder?: string;
chatPlaceholder?: string;
hideCoco?: () => void;
setIsPinned?: (value: boolean) => void;
onModeChange?: (isChatMode: boolean) => void;
isMobile?: boolean;
@@ -49,7 +49,6 @@ function SearchChat({
hasModules = ["search", "chat"],
defaultModule = "search",
theme,
hideCoco,
searchPlaceholder,
chatPlaceholder,
showChatHistory = true,
@@ -63,12 +62,12 @@ function SearchChat({
const source = currentAssistant?._source;
const customInitialState = {
const customInitialState = useMemo(() => ({
...initialAppState,
isDeepThinkActive: source?.type === "deep_think",
isSearchActive: source?.datasource?.enabled_by_default === true,
isMCPActive: source?.mcp_servers?.enabled_by_default === true,
};
}), [source]);
const [state, dispatch] = useReducer(appReducer, customInitialState);
const {
@@ -80,17 +79,23 @@ function SearchChat({
isMCPActive,
isTyping,
} = state;
useEffect(() => {
dispatch({ type: "SET_SEARCH_ACTIVE", payload: customInitialState.isSearchActive });
dispatch({ type: "SET_DEEP_THINK_ACTIVE", payload: customInitialState.isDeepThinkActive });
dispatch({ type: "SET_MCP_ACTIVE", payload: customInitialState.isMCPActive });
}, [customInitialState]);
const [isWin10, setIsWin10] = useState(false);
const blurred = useAppStore((state) => state.blurred);
useWindowEvents();
const initializeListeners = useAppStore((state) => state.initializeListeners);
const initializeListeners_auth = useAuthStore(
(state) => state.initializeListeners
);
const initializeListeners_auth = useAuthStore((state) => {
return state.initializeListeners;
});
const setTheme = useThemeStore((state) => state.setTheme);
const setIsDark = useThemeStore((state) => state.setIsDark);
const isChatModeRef = useRef(false);
useEffect(() => {
@@ -103,7 +108,7 @@ function SearchChat({
setIsWin10(isWin10);
const unlisten = platformAdapter.listenEvent("show-coco", () => {
console.log("show-coco");
//console.log("show-coco");
platformAdapter.invokeBackend("simulate_mouse_click", {
isChatMode: isChatModeRef.current,
@@ -118,7 +123,6 @@ function SearchChat({
useEffect(() => {
const init = async () => {
await initializeListeners();
await initializeListeners_auth();
await platformAdapter.invokeBackend("get_app_search_source");
};
@@ -129,6 +133,7 @@ function SearchChat({
useEffect(() => {
if (!theme) return;
setIsDark(theme === "dark");
setTheme(theme);
}, [theme]);
@@ -231,10 +236,10 @@ function SearchChat({
if (isTauri) {
changeMode(defaultStartupWindow === "chatMode");
} else {
if (hasModules?.length === 1 && hasModules?.includes("chat")) {
changeMode(true);
} else {
if (hasModules?.length > 1) {
changeMode(defaultModule === "chat");
} else {
changeMode(hasModules?.includes("chat") ?? false);
}
}
}, []);
@@ -259,33 +264,34 @@ function SearchChat({
)}
style={{ opacity: blurred ? (opacity ?? 30) / 100 : 1 }}
>
{isTransitioned && (
<div
data-tauri-drag-region={isTauri}
className="flex-1 w-full overflow-hidden"
>
<Suspense fallback={<LoadingFallback />}>
<ChatAI
ref={chatAIRef}
key="ChatAI"
changeInput={setInput}
isSearchActive={isSearchActive}
isDeepThinkActive={isDeepThinkActive}
isMCPActive={isMCPActive}
getFileUrl={getFileUrl}
showChatHistory={showChatHistory}
assistantIDs={assistantIDs}
startPage={startPage}
/>
</Suspense>
</div>
)}
<div
data-tauri-drag-region={isTauri}
className={`p-2 w-full flex justify-center transition-all duration-500 min-h-[82px] ${
isTransitioned ? "border-t" : "border-b"
} border-[#E6E6E6] dark:border-[#272626]`}
className={clsx(
"flex-1 w-full overflow-auto",
{ "hidden": !isTransitioned }
)}
>
<Suspense fallback={<LoadingFallback />}>
<ChatAI
ref={chatAIRef}
key="ChatAI"
changeInput={setInput}
isSearchActive={isSearchActive}
isDeepThinkActive={isDeepThinkActive}
isMCPActive={isMCPActive}
getFileUrl={getFileUrl}
showChatHistory={showChatHistory}
assistantIDs={assistantIDs}
startPage={startPage}
/>
</Suspense>
</div>
<div
data-tauri-drag-region={isTauri}
className={`p-2 w-full flex justify-center transition-all duration-500 min-h-[82px] ${isTransitioned ? "border-t" : "border-b"
} border-[#E6E6E6] dark:border-[#272626]`}
>
<InputBox
isChatMode={isChatMode}
@@ -315,27 +321,26 @@ function SearchChat({
hasModules={hasModules}
searchPlaceholder={searchPlaceholder}
chatPlaceholder={chatPlaceholder}
hideCoco={hideCoco}
/>
</div>
{!isTransitioned && (
<div
data-tauri-drag-region={isTauri}
className="flex-1 w-full overflow-auto"
>
<Suspense fallback={<LoadingFallback />}>
<Search
key="Search"
input={input}
isChatMode={isChatMode}
changeInput={setInput}
hideCoco={hideCoco}
setIsPinned={setIsPinned}
/>
</Suspense>
</div>
)}
<div
data-tauri-drag-region={isTauri}
className={clsx(
"flex-1 w-full overflow-auto",
{ "hidden": isTransitioned }
)}
>
<Suspense fallback={<LoadingFallback />}>
<Search
key="Search"
input={input}
isChatMode={isChatMode}
changeInput={setInput}
setIsPinned={setIsPinned}
/>
</Suspense>
</div>
</div>
);
}

View File

@@ -8,8 +8,8 @@ import { isMac } from "@/utils/platform";
import {
INITIAL_MODE_SWITCH,
INITIAL_RETURN_TO_INPUT,
INITIAL_VOICE_INPUT,
INITIAL_ADD_FILE,
// INITIAL_VOICE_INPUT,
// INITIAL_ADD_FILE,
INITIAL_DEEP_THINKING,
INITIAL_INTERNET_SEARCH,
INITIAL_INTERNET_SEARCH_SCOPE,
@@ -22,11 +22,14 @@ import {
INITIAL_SERVICE_LIST,
INITIAL_EXTERNAL,
useShortcutsStore,
INITIAL_AI_OVERVIEW,
} from "@/stores/shortcutsStore";
import { ModifierKey } from "@/types/index";
import platformAdapter from "@/utils/platformAdapter";
import { useAppStore } from "@/stores/appStore";
import SettingsInput from "@/components/Settings/SettingsInput";
import { Button } from "@headlessui/react";
import clsx from "clsx";
export const modifierKeys: ModifierKey[] = isMac
? ["meta", "ctrl"]
@@ -40,10 +43,10 @@ const Shortcuts = () => {
const setModeSwitch = useShortcutsStore((state) => state.setModeSwitch);
const returnToInput = useShortcutsStore((state) => state.returnToInput);
const setReturnToInput = useShortcutsStore((state) => state.setReturnToInput);
const voiceInput = useShortcutsStore((state) => state.voiceInput);
const setVoiceInput = useShortcutsStore((state) => state.setVoiceInput);
const addFile = useShortcutsStore((state) => state.addFile);
const setAddFile = useShortcutsStore((state) => state.setAddFile);
// const voiceInput = useShortcutsStore((state) => state.voiceInput);
// const setVoiceInput = useShortcutsStore((state) => state.setVoiceInput);
// const addFile = useShortcutsStore((state) => state.addFile);
// const setAddFile = useShortcutsStore((state) => state.setAddFile);
const deepThinking = useShortcutsStore((state) => state.deepThinking);
const setDeepThinking = useShortcutsStore((state) => state.setDeepThinking);
const internetSearch = useShortcutsStore((state) => state.internetSearch);
@@ -87,6 +90,8 @@ const Shortcuts = () => {
const external = useShortcutsStore((state) => state.external);
const setExternal = useShortcutsStore((state) => state.setExternal);
const addError = useAppStore((state) => state.addError);
const aiOverview = useShortcutsStore((state) => state.aiOverview);
const setAiOverview = useShortcutsStore((state) => state.setAiOverview);
useEffect(() => {
const unlisten = useShortcutsStore.subscribe((state) => {
@@ -100,138 +105,119 @@ const Shortcuts = () => {
{
title: "settings.advanced.shortcuts.modeSwitch.title",
description: "settings.advanced.shortcuts.modeSwitch.description",
initialValue: INITIAL_MODE_SWITCH,
value: modeSwitch,
setValue: setModeSwitch,
reset: () => {
setModeSwitch(INITIAL_MODE_SWITCH);
},
},
{
title: "settings.advanced.shortcuts.returnToInput.title",
description: "settings.advanced.shortcuts.returnToInput.description",
initialValue: INITIAL_RETURN_TO_INPUT,
value: returnToInput,
setValue: setReturnToInput,
reset: () => {
setReturnToInput(INITIAL_RETURN_TO_INPUT);
},
},
{
title: "settings.advanced.shortcuts.voiceInput.title",
description: "settings.advanced.shortcuts.voiceInput.description",
value: voiceInput,
setValue: setVoiceInput,
reset: () => {
setVoiceInput(INITIAL_VOICE_INPUT);
},
},
{
title: "settings.advanced.shortcuts.addFile.title",
description: "settings.advanced.shortcuts.addFile.description",
value: addFile,
setValue: setAddFile,
reset: () => {
setAddFile(INITIAL_ADD_FILE);
},
},
// {
// title: "settings.advanced.shortcuts.voiceInput.title",
// description: "settings.advanced.shortcuts.voiceInput.description",
// value: voiceInput,
// setValue: setVoiceInput,
// reset: () => {
// handleChange(INITIAL_VOICE_INPUT, setVoiceInput);
// },
// },
// {
// title: "settings.advanced.shortcuts.addFile.title",
// description: "settings.advanced.shortcuts.addFile.description",
// value: addFile,
// setValue: setAddFile,
// reset: () => {
// handleChange(INITIAL_ADD_FILE, setAddFile);
// },
// },
{
title: "settings.advanced.shortcuts.deepThinking.title",
description: "settings.advanced.shortcuts.deepThinking.description",
initialValue: INITIAL_DEEP_THINKING,
value: deepThinking,
setValue: setDeepThinking,
reset: () => {
setDeepThinking(INITIAL_DEEP_THINKING);
},
},
{
title: "settings.advanced.shortcuts.internetSearch.title",
description: "settings.advanced.shortcuts.internetSearch.description",
initialValue: INITIAL_INTERNET_SEARCH,
value: internetSearch,
setValue: setInternetSearch,
reset: () => {
setInternetSearch(INITIAL_INTERNET_SEARCH);
},
},
{
title: "settings.advanced.shortcuts.internetSearchScope.title",
description:
"settings.advanced.shortcuts.internetSearchScope.description",
initialValue: INITIAL_INTERNET_SEARCH_SCOPE,
value: internetSearchScope,
setValue: setInternetSearchScope,
reset: () => {
setInternetSearchScope(INITIAL_INTERNET_SEARCH_SCOPE);
},
},
{
title: "settings.advanced.shortcuts.mcpSearch.title",
description: "settings.advanced.shortcuts.mcpSearch.description",
initialValue: INITIAL_MCP_SEARCH,
value: mcpSearch,
setValue: setMcpSearch,
reset: () => {
setMcpSearch(INITIAL_MCP_SEARCH);
},
},
{
title: "settings.advanced.shortcuts.mcpSearchScope.title",
description: "settings.advanced.shortcuts.mcpSearchScope.description",
initialValue: INITIAL_MCP_SEARCH_SCOPE,
value: mcpSearchScope,
setValue: setMcpSearchScope,
reset: () => {
setMcpSearchScope(INITIAL_MCP_SEARCH_SCOPE);
},
},
{
title: "settings.advanced.shortcuts.historicalRecords.title",
description: "settings.advanced.shortcuts.historicalRecords.description",
initialValue: INITIAL_HISTORICAL_RECORDS,
value: historicalRecords,
setValue: setHistoricalRecords,
reset: () => {
setHistoricalRecords(INITIAL_HISTORICAL_RECORDS);
},
},
{
title: "settings.advanced.shortcuts.aiAssistant.title",
description: "settings.advanced.shortcuts.aiAssistant.description",
initialValue: INITIAL_AI_ASSISTANT,
value: aiAssistant,
setValue: setAiAssistant,
reset: () => {
setAiAssistant(INITIAL_AI_ASSISTANT);
},
},
{
title: "settings.advanced.shortcuts.newSession.title",
description: "settings.advanced.shortcuts.newSession.description",
initialValue: INITIAL_NEW_SESSION,
value: newSession,
setValue: setNewSession,
reset: () => {
setNewSession(INITIAL_NEW_SESSION);
},
},
{
title: "settings.advanced.shortcuts.fixedWindow.title",
description: "settings.advanced.shortcuts.fixedWindow.description",
initialValue: INITIAL_FIXED_WINDOW,
value: fixedWindow,
setValue: setFixedWindow,
reset: () => {
setFixedWindow(INITIAL_FIXED_WINDOW);
},
},
{
title: "settings.advanced.shortcuts.serviceList.title",
description: "settings.advanced.shortcuts.serviceList.description",
initialValue: INITIAL_SERVICE_LIST,
value: serviceList,
setValue: setServiceList,
reset: () => {
setServiceList(INITIAL_SERVICE_LIST);
},
},
{
title: "settings.advanced.shortcuts.external.title",
description: "settings.advanced.shortcuts.external.description",
initialValue: INITIAL_EXTERNAL,
value: external,
setValue: setExternal,
reset: () => {
setExternal(INITIAL_EXTERNAL);
},
},
{
title: "settings.advanced.shortcuts.aiOverview.title",
description: "settings.advanced.shortcuts.aiOverview.description",
initialValue: INITIAL_AI_OVERVIEW,
value: aiOverview,
setValue: setAiOverview,
},
];
@@ -290,7 +276,9 @@ const Shortcuts = () => {
</SettingsItem>
{list.map((item) => {
const { title, description, value, setValue, reset } = item;
const { title, description, initialValue, value, setValue } = item;
const disabled = value === initialValue;
return (
<SettingsItem
@@ -310,12 +298,25 @@ const Shortcuts = () => {
}}
/>
<button
className="flex items-center justify-center size-8 rounded-md border border-black/5 dark:border-white/10 hover:border-[#0072FF] transition"
onClick={reset}
<Button
disabled={disabled}
className={clsx(
"flex items-center justify-center size-8 rounded-md border border-black/5 dark:border-white/10 transition",
{
"hover:border-[#0072FF]": !disabled,
"opacity-70 cursor-not-allowed": disabled,
}
)}
onClick={() => {
handleChange(initialValue, setValue);
}}
>
<RotateCcw className="size-4 text-[#0072FF]" />
</button>
<RotateCcw
className={clsx("size-4 text-[#999]", {
"!text-[#0072FF]": !disabled,
})}
/>
</Button>
</div>
</SettingsItem>
);

View File

@@ -71,13 +71,8 @@ const Advanced = () => {
platformAdapter.emitEvent("change-startup-store", state);
});
const unsubscribeConnect = useConnectStore.subscribe((state) => {
platformAdapter.emitEvent("change-connect-store", state);
});
return () => {
unsubscribeStartup();
unsubscribeConnect();
};
}, []);

View File

@@ -1,6 +1,7 @@
import { useExtensionsStore } from "@/stores/extensionsStore";
import SharedAi from "../SharedAi";
import SettingsInput from "@/components/Settings/SettingsInput";
import { useTranslation } from "react-i18next";
const AiOverview = () => {
const aiOverviewServer = useExtensionsStore((state) => {
@@ -27,15 +28,33 @@ const AiOverview = () => {
const setAiOverviewDelay = useExtensionsStore((state) => {
return state.setAiOverviewDelay;
});
const aiOverviewMinQuantity = useExtensionsStore((state) => {
return state.aiOverviewMinQuantity;
});
const setAiOverviewMinQuantity = useExtensionsStore((state) => {
return state.setAiOverviewMinQuantity;
});
const { t } = useTranslation();
const inputList = [
{
label: "Minimum Input Length(characters)",
label: t(
"settings.extensions.aiOverview.details.aiOverviewTrigger.label.minQuantity"
),
value: aiOverviewMinQuantity,
onChange: setAiOverviewMinQuantity,
},
{
label: t(
"settings.extensions.aiOverview.details.aiOverviewTrigger.label.minCharLen"
),
value: aiOverviewCharLen,
onChange: setAiOverviewCharLen,
},
{
label: "Delay After Typing Stops(seconds)",
label: t(
"settings.extensions.aiOverview.details.aiOverviewTrigger.label.minDelay"
),
value: aiOverviewDelay,
onChange: setAiOverviewDelay,
},
@@ -52,13 +71,15 @@ const AiOverview = () => {
setAssistant={setAiOverviewAssistant}
/>
<div className="text-sm">
<>
<div className="mt-6 text-[#333] dark:text-white/90">
AI Overview Trigger
{t("settings.extensions.aiOverview.details.aiOverviewTrigger.title")}
</div>
<div className="pt-2 pb-4 text-[#999]">
AI Overview will be triggered when both conditions are met.
{t(
"settings.extensions.aiOverview.details.aiOverviewTrigger.description"
)}
</div>
<div className="flex flex-col gap-2">
@@ -83,7 +104,7 @@ const AiOverview = () => {
);
})}
</div>
</div>
</>
</>
);
};

View File

@@ -74,7 +74,7 @@ const Applications = () => {
};
return (
<div className="text-sm">
<>
<div className="text-[#999]">
<p className="font-bold mb-2">
{t("settings.extensions.application.details.searchScope")}
@@ -106,7 +106,7 @@ const Applications = () => {
<SquareArrowOutUpRight
className="size-4 cursor-pointer"
onClick={() => {
platformAdapter.openExternal(item);
platformAdapter.revealItemInDir(item);
}}
/>
@@ -119,7 +119,7 @@ const Applications = () => {
);
})}
</ul>
</div>
</>
);
};

View File

@@ -0,0 +1,13 @@
import { useTranslation } from "react-i18next";
const Calculator = () => {
const { t } = useTranslation();
return (
<div className="text-[#999]">
{t("settings.extensions.calculator.description")}
</div>
);
};
export default Calculator;

View File

@@ -6,6 +6,8 @@ import platformAdapter from "@/utils/platformAdapter";
import { useAsyncEffect, useMount } from "ahooks";
import { FC, useMemo, useState } from "react";
import { ExtensionId } from "../../..";
import { useTranslation } from "react-i18next";
import { isArray } from "lodash-es";
interface SharedAiProps {
id: ExtensionId;
@@ -22,6 +24,7 @@ const SharedAi: FC<SharedAiProps> = (props) => {
const [assistantList, setAssistantList] = useState<any[]>([assistant]);
const addError = useAppStore((state) => state.addError);
const { fetchAssistant } = AssistantFetcher({});
const { t } = useTranslation();
useMount(async () => {
try {
@@ -29,11 +32,25 @@ const SharedAi: FC<SharedAiProps> = (props) => {
"list_coco_servers"
);
setServerList(data);
if (isArray(data)) {
const enabledServers = data.filter(
(s) => s.enabled && s.available && (s.public || s.profile)
);
if (server) return;
setServerList(enabledServers);
setServer(data[0]);
if (server) {
const matchServer = enabledServers.find((item) => {
return item.id === server.id;
});
if (matchServer) {
return setServer(matchServer);
}
}
setServer(enabledServers[0]);
}
} catch (error) {
addError(String(error));
}
@@ -72,7 +89,9 @@ const SharedAi: FC<SharedAiProps> = (props) => {
const selectList = useMemo(() => {
return [
{
label: "Coco Server",
label: t(
"settings.extensions.shardAi.details.linkedAssistant.label.cocoServer"
),
value: server?.id,
icon: server?.provider?.icon,
data: serverList,
@@ -83,7 +102,9 @@ const SharedAi: FC<SharedAiProps> = (props) => {
},
},
{
label: "AI Assistant",
label: t(
"settings.extensions.shardAi.details.linkedAssistant.label.aiAssistant"
),
value: assistant?.id,
icon: assistant?.icon,
data: assistantList,
@@ -98,19 +119,21 @@ const SharedAi: FC<SharedAiProps> = (props) => {
const renderDescription = () => {
if (id === "QuickAIAccess") {
return "Quick AI access allows you to start a conversation immediately from the search box using the tab key.";
return t("settings.extensions.quickAiAccess.description");
}
if (id === "AIOverview") {
return "AI Summarize generates concise summaries based on your search results, helping you quickly grasp key information without reading every document.";
return t("settings.extensions.aiOverview.description");
}
};
return (
<div className="text-sm">
<>
<div className="text-[#999]">{renderDescription()}</div>
<div className="mt-6 text-[#333] dark:text-white/90">LinkedAssistant</div>
<div className="mt-6 text-[#333] dark:text-white/90">
{t("settings.extensions.shardAi.details.linkedAssistant.title")}
</div>
{selectList.map((item) => {
const { label, value, icon, data, onChange } = item;
@@ -138,7 +161,7 @@ const SharedAi: FC<SharedAiProps> = (props) => {
</div>
);
})}
</div>
</>
);
};

View File

@@ -6,6 +6,7 @@ import Application from "./Application";
import { useExtensionsStore } from "@/stores/extensionsStore";
import SharedAi from "./SharedAi";
import AiOverview from "./AiOverview";
import Calculator from "./Calculator";
const Details = () => {
const { rootState } = useContext(ExtensionsContext);
@@ -51,6 +52,10 @@ const Details = () => {
if (id === "AIOverview") {
return <AiOverview />;
}
if (id === "Calculator") {
return <Calculator />;
}
};
return (
@@ -59,7 +64,7 @@ const Details = () => {
{rootState.activeExtension?.title}
</h2>
<div className="pr-4 pb-4">{renderContent()}</div>
<div className="pr-4 pb-4 text-sm">{renderContent()}</div>
</div>
);
};

View File

@@ -12,9 +12,7 @@ import {
} from "lucide-react";
import { useTranslation } from "react-i18next";
import { isTauri } from "@tauri-apps/api/core";
import {
isEnabled,
} from "@tauri-apps/plugin-autostart";
import { isEnabled } from "@tauri-apps/plugin-autostart";
import { emit } from "@tauri-apps/api/event";
import { useCreation } from "ahooks";
@@ -26,7 +24,12 @@ import { useShortcutEditor } from "@/hooks/useShortcutEditor";
import { useAppStore } from "@/stores/appStore";
import { AppTheme } from "@/types/index";
import { useThemeStore } from "@/stores/themeStore";
import { change_autostart, get_current_shortcut, change_shortcut, unregister_shortcut } from "@/commands"
import {
change_autostart,
get_current_shortcut,
change_shortcut,
unregister_shortcut,
} from "@/commands";
export function ThemeOption({
icon: Icon,
@@ -132,9 +135,6 @@ export default function GeneralSettings() {
useEffect(() => {
fetchAutoStartStatus();
getCurrentShortcut();
if (language) {
i18n.changeLanguage(language);
}
}, []);
const changeShortcut = (key: Shortcut) => {
@@ -180,17 +180,6 @@ export default function GeneralSettings() {
const currentLanguage = language || i18n.language;
const changeLanguage = async (lang: string) => {
i18n.changeLanguage(lang);
setLanguage(lang);
//
try {
await emit("language-changed", { language: lang });
} catch (error) {
console.error("Failed to emit language change event:", error);
}
};
return (
<div className="space-y-8">
<div>
@@ -262,7 +251,7 @@ export default function GeneralSettings() {
<div className="flex items-center gap-2">
<select
value={currentLanguage}
onChange={(e) => changeLanguage(e.target.value)}
onChange={(e) => setLanguage(e.target.value)}
className="px-3 py-1.5 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
>
<option value="en">{t("settings.language.english")}</option>

View File

@@ -3,6 +3,8 @@ import clsx from "clsx";
import { isNumber } from "lodash-es";
import { FC, FocusEvent } from "react";
import { specialCharacterFiltering } from "@/utils"
interface SettingsInputProps extends Omit<InputProps, "onChange"> {
onChange: (value?: string | number) => void;
}
@@ -38,7 +40,8 @@ const SettingsInput: FC<SettingsInputProps> = (props) => {
)}
onBlur={handleBlur}
onChange={(event) => {
onChange?.(event.target.value);
const value = specialCharacterFiltering(event.target.value)
onChange?.(value);
}}
/>
);

View File

@@ -14,7 +14,7 @@ export default function SettingsToggle(props: SettingsToggleProps) {
{...rest}
className={clsx(
`group relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent
transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 bg-gray-200 dark:bg-gray-700 data-[checked]:bg-blue-600`,
transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 bg-gray-200 data-[checked]:bg-blue-600`,
className
)}
>

View File

@@ -3,5 +3,3 @@ export const POPOVER_PANEL_SELECTOR = '[id^="headlessui-popover-panel"]';
export const HISTORY_PANEL_ID = "headlessui-popover-panel:history-panel";
export const CONTEXT_MENU_PANEL_ID = "headlessui-popover-panel:context-menu";
export const COPY_BUTTON_ID = "copy-button";

View File

@@ -22,20 +22,22 @@ export function useChatActions(
isMCPActive?: boolean,
changeInput?: (val: string) => void,
websocketSessionId?: string,
showChatHistory?: boolean,
showChatHistory?: boolean
) {
const isCurrentLogin = useAuthStore(state => state.isCurrentLogin);
const isCurrentLogin = useAuthStore((state) => state.isCurrentLogin);
const isTauri = useAppStore((state) => state.isTauri);
const addError = useAppStore((state) => state.addError);
const currentAssistant = useConnectStore((state) => state.currentAssistant);
const {
currentAssistant,
setCurrentAssistant,
assistantList,
setVisibleStartPage,
currentService,
} = useConnectStore();
const { connected } = useChatStore();
const sourceDataIds = useSearchStore((state) => state.sourceDataIds);
const MCPIds = useSearchStore((state) => state.MCPIds);
const setVisibleStartPage = useConnectStore((state) => {
return state.setVisibleStartPage;
});
const currentService = useConnectStore((state) => state.currentService);
const [keyword, setKeyword] = useState("");
@@ -52,14 +54,10 @@ export function useChatActions(
});
response = response ? JSON.parse(response) : null;
} else {
const [_error, res] = await Post(
`/chat/${activeChat?._id}/_close`,
{}
);
const [_error, res] = await Post(`/chat/${activeChat?._id}/_close`, {});
response = res;
}
console.log("_close", response);
},
[currentService?.id, isTauri]
);
@@ -88,6 +86,8 @@ export function useChatActions(
[currentService?.id, isTauri]
);
// 1. handleSendMessage callback
// 2. onSelectChat no callback
const chatHistory = useCallback(
async (chat: Chat, callback?: (chat: Chat) => void) => {
if (!chat?._id) return;
@@ -111,6 +111,15 @@ export function useChatActions(
}
const hits = response?.hits?.hits || [];
// set current assistant
const lastAssistantId = hits[hits.length - 1]?._source?.assistant_id;
const matchedAssistant = assistantList?.find(
(assistant) => assistant._id === lastAssistantId
);
if (matchedAssistant && !callback) {
setCurrentAssistant(matchedAssistant);
}
//
const updatedChat: Chat = {
...chat,
messages: hits,
@@ -120,7 +129,7 @@ export function useChatActions(
callback && callback(updatedChat);
setVisibleStartPage(false);
},
[currentService?.id, isTauri]
[currentService?.id, isTauri, assistantList]
);
const createNewChat = useCallback(
@@ -144,7 +153,7 @@ export function useChatActions(
mcp: isMCPActive,
datasource: sourceDataIds?.join(",") || "",
mcp_servers: MCPIds?.join(",") || "",
assistant_id: currentAssistant?._id || '',
assistant_id: currentAssistant?._id || "",
};
let response: any;
if (isTauri) {
@@ -169,11 +178,12 @@ export function useChatActions(
response = res;
}
console.log("_new", response);
console.log("_new", response, queryParams);
const newChat: Chat = response;
curIdRef.current = response?.payload?.id;
newChat._source = {
...response?.payload,
message: value,
};
const updatedChat: Chat = {
@@ -220,8 +230,8 @@ export function useChatActions(
mcp: isMCPActive,
datasource: sourceDataIds?.join(",") || "",
mcp_servers: MCPIds?.join(",") || "",
assistant_id: currentAssistant?._id || '',
}
assistant_id: currentAssistant?._id || "",
};
let response: any;
if (isTauri) {
if (!currentService?.id) return;
@@ -247,7 +257,7 @@ export function useChatActions(
response = res;
}
console.log("_send", response);
console.log("_send", response, queryParams);
curIdRef.current = response[0]?._id;
const updatedChat: Chat = {
@@ -284,10 +294,7 @@ export function useChatActions(
await chatHistory(activeChat, (chat) => sendMessage(content, chat, id));
},
[
chatHistory,
sendMessage,
]
[chatHistory, sendMessage]
);
const openSessionChat = useCallback(
@@ -310,7 +317,6 @@ export function useChatActions(
console.log("_open", response);
return response;
},
[currentService?.id, isTauri]
);
@@ -318,9 +324,8 @@ export function useChatActions(
const getChatHistory = useCallback(async () => {
let response: any;
if (isTauri) {
if (!currentService?.id || !isCurrentLogin) {
setChats([]);
return
if (!currentService?.id || !isCurrentLogin || !currentService?.enabled) {
return setChats([]);
}
response = await platformAdapter.commands("chat_history", {
@@ -342,52 +347,67 @@ export function useChatActions(
console.log("_history", response);
const hits = response?.hits?.hits || [];
setChats(hits);
}, [currentService?.id, keyword, isTauri]);
}, [currentService?.id, keyword, isTauri, currentService?.enabled, isCurrentLogin]);
useEffect(() => {
showChatHistory && connected && getChatHistory();
if (showChatHistory && connected) {
getChatHistory()
}
}, [showChatHistory, connected, getChatHistory, currentService?.id]);
const createChatWindow = useCallback(async (createWin: any) => {
if (isTauri) {
createWin &&
createWin({
label: "chat",
title: "Coco Chat",
dragDropEnabled: true,
center: true,
width: 1000,
height: 800,
minWidth: 1000,
minHeight: 800,
alwaysOnTop: false,
skipTaskbar: false,
decorations: true,
closable: true,
url: "/ui/chat",
});
}
}, [isTauri]);
const createChatWindow = useCallback(
async (createWin: any) => {
if (isTauri) {
createWin &&
createWin({
label: "chat",
title: "Coco Chat",
dragDropEnabled: true,
center: true,
width: 1000,
height: 800,
minWidth: 1000,
minHeight: 800,
alwaysOnTop: false,
skipTaskbar: false,
decorations: true,
closable: true,
url: "/ui/chat",
});
}
},
[isTauri]
);
const handleSearch = (keyword: string) => {
setKeyword(keyword);
};
const handleRename = useCallback(async (chatId: string, title: string) => {
if (!currentService?.id) return;
const handleRename = useCallback(
async (chatId: string, title: string) => {
if (!currentService?.id) return;
await platformAdapter.commands("update_session_chat", {
serverId: currentService?.id,
sessionId: chatId,
title,
});
}, [currentService?.id]);
await platformAdapter.commands("update_session_chat", {
serverId: currentService?.id,
sessionId: chatId,
title,
});
},
[currentService?.id]
);
const handleDelete = useCallback(async (chatId: string) => {
if (!currentService?.id) return;
const handleDelete = useCallback(
async (chatId: string) => {
if (!currentService?.id) return;
await platformAdapter.commands("delete_session_chat", currentService?.id, chatId);
}, [currentService?.id]);
await platformAdapter.commands(
"delete_session_chat",
currentService?.id,
chatId
);
},
[currentService?.id]
);
return {
chatClose,

View File

@@ -1,4 +1,4 @@
import { useCallback, useEffect } from 'react';
import { useCallback, useEffect } from "react";
import { isMetaOrCtrlKey } from "@/utils/keyboardUtils";
import { useSearchStore } from "@/stores/searchStore";
@@ -6,21 +6,18 @@ import { useSearchStore } from "@/stores/searchStore";
interface KeyboardHandlersProps {
isChatMode: boolean;
handleSubmit: () => void;
disabledChange?: () => void;
curChatEnd?: boolean;
}
export function useKeyboardHandlers({
isChatMode,
handleSubmit,
disabledChange,
curChatEnd,
}: KeyboardHandlersProps) {
const { setSourceData } = useSearchStore();
const handleKeyDown = useCallback(
(e: KeyboardEvent) => {
// Handle ArrowLeft with meta key
if (e.code === "ArrowLeft" && isMetaOrCtrlKey(e)) {
e.preventDefault();
@@ -29,12 +26,12 @@ export function useKeyboardHandlers({
}
// Handle Enter without meta key requirement
if (e.code === "Enter" && isChatMode) {
if (e.code === "Enter" && !e.shiftKey && isChatMode) {
e.preventDefault();
curChatEnd ? handleSubmit() : disabledChange?.();
curChatEnd && handleSubmit();
}
},
[isChatMode, handleSubmit, setSourceData, disabledChange, curChatEnd]
[isChatMode, handleSubmit, setSourceData, curChatEnd]
);
useEffect(() => {
@@ -50,4 +47,4 @@ export function useKeyboardHandlers({
setSourceData(undefined);
};
}, []);
}
}

View File

@@ -1,10 +1,9 @@
import { useCallback, useEffect } from "react";
import { useShortcutsStore } from "@/stores/shortcutsStore";
import { isMetaOrCtrlKey, metaOrCtrlKey } from "@/utils/keyboardUtils";
import { copyToClipboard, OpenURLWithBrowser } from "@/utils/index";
import type { QueryHits, SearchDocument } from "@/types/search";
import platformAdapter from "@/utils/platformAdapter";
import { useSearchStore } from "@/stores/searchStore";
interface UseKeyboardNavigationProps {
suggests: QueryHits[];
@@ -30,25 +29,64 @@ export function useKeyboardNavigation({
isChatMode,
}: UseKeyboardNavigationProps) {
const openPopover = useShortcutsStore((state) => state.openPopover);
const visibleContextMenu = useSearchStore((state) => {
return state.visibleContextMenu;
});
const modifierKey = useShortcutsStore((state) => {
return state.modifierKey;
});
const getModifierKeyPressed = (event: KeyboardEvent) => {
const metaKeyPressed = event.metaKey && modifierKey === "meta";
const ctrlKeyPressed = event.ctrlKey && modifierKey === "ctrl";
const altKeyPressed = event.altKey && modifierKey === "alt";
return metaKeyPressed || ctrlKeyPressed || altKeyPressed;
};
const handleKeyDown = useCallback(
(e: KeyboardEvent) => {
if (!suggests.length || openPopover) return;
if (isChatMode || !suggests.length || openPopover || visibleContextMenu) {
return;
}
const modifierKeyPressed = getModifierKeyPressed(e);
const indexes = suggests.map((item) => item.document.index!);
if (e.key === "ArrowUp") {
e.preventDefault();
//console.log("ArrowUp pressed", selectedIndex, suggests.length);
setSelectedIndex((prev) =>
prev === null || prev === 0 ? suggests.length - 1 : prev - 1
);
// console.log("ArrowUp pressed", selectedIndex, suggests.length);
setSelectedIndex((prev) => {
if (prev == null) {
return Math.min(...indexes);
}
const nextIndex = prev - 1;
if (indexes.includes(nextIndex)) {
return nextIndex;
}
return Math.max(...indexes);
});
} else if (e.key === "ArrowDown") {
e.preventDefault();
//console.log("ArrowDown pressed", selectedIndex, suggests.length);
setSelectedIndex((prev) =>
prev === null || prev === suggests.length - 1 ? 0 : prev + 1
);
} else if (e.key === metaOrCtrlKey()) {
e.preventDefault();
setSelectedIndex((prev) => {
if (prev == null) {
return Math.min(...indexes);
}
const nextIndex = prev + 1;
if (indexes.includes(nextIndex)) {
return nextIndex;
}
return Math.min(...indexes);
});
} else if (modifierKeyPressed) {
if (selectedIndex !== null) {
const item = globalItemIndexMap[selectedIndex];
setSelectedName(item?.source?.name || "");
@@ -57,9 +95,9 @@ export function useKeyboardNavigation({
}
if (
modifierKeyPressed &&
e.key === "ArrowRight" &&
selectedIndex !== null &&
isMetaOrCtrlKey(e)
selectedIndex !== null
) {
e.preventDefault();
@@ -70,29 +108,20 @@ export function useKeyboardNavigation({
if (e.key === "Enter" && !e.shiftKey && selectedIndex !== null) {
const item = globalItemIndexMap[selectedIndex];
if (item?.on_opened) {
return platformAdapter.invokeBackend("open", {
onOpened: item.on_opened,
});
}
if (item?.url) {
return OpenURLWithBrowser(item.url);
}
copyToClipboard(item?.payload?.result?.value);
return platformAdapter.openSearchItem(item);
}
if (e.key >= "0" && e.key <= "9" && showIndex && isMetaOrCtrlKey(e)) {
if (e.key >= "0" && e.key <= "9" && showIndex && modifierKeyPressed) {
e.preventDefault();
let index = parseInt(e.key, 10);
index = index === 0 ? 9 : index - 1;
const item = globalItemIndexMap[index];
if (item?.on_opened) {
platformAdapter.invokeBackend("open", { onOpened: item.on_opened });
}
platformAdapter.openSearchItem(item);
}
},
[suggests, selectedIndex, showIndex, globalItemIndexMap, openPopover]
@@ -100,9 +129,11 @@ export function useKeyboardNavigation({
const handleKeyUp = useCallback(
(e: KeyboardEvent) => {
if (!suggests.length) return;
if (isChatMode || !suggests.length) return;
if (!isMetaOrCtrlKey(e)) {
const modifierKeyPressed = getModifierKeyPressed(e);
if (modifierKeyPressed) {
setShowIndex(false);
}
},
@@ -110,8 +141,6 @@ export function useKeyboardNavigation({
);
useEffect(() => {
if (isChatMode) return;
window.addEventListener("keydown", handleKeyDown);
window.addEventListener("keyup", handleKeyUp);

View File

@@ -1,9 +1,9 @@
import { useEffect, useState } from "react";
import { useEffect } from "react";
const useScript = (src: string, onError?: () => void) => {
useEffect(() => {
if (document.querySelector(`script[src="${src}"]`)) {
return; // Prevent duplicate script loading
return;
}
const script = document.createElement("script");
@@ -12,7 +12,8 @@ const useScript = (src: string, onError?: () => void) => {
script.onerror = () => {
console.error(`Failed to load script: ${src}`);
if (onError) onError();
onError?.();
};
document.body.appendChild(script);
@@ -26,23 +27,8 @@ const useScript = (src: string, onError?: () => void) => {
export default useScript;
export const useIconfontScript = () => {
const appStore = JSON.parse(localStorage.getItem("app-store") || "{}");
const [_useLocalFallback, setUseLocalFallback] = useState(false);
let baseURL = appStore.state?.endpoint_http;
if (!baseURL || baseURL === "undefined") {
baseURL = "";
}
useScript("/assets/fonts/icons/iconfont.js");
useScript(`${baseURL}/assets/fonts/icons/iconfont.js`, () => {
console.log(
"Remote iconfont loading failed, falling back to local resource"
);
setUseLocalFallback(true);
});
useScript("/assets/fonts/icons/extension.js");
// Coco Server Icons
useScript("https://at.alicdn.com/t/c/font_4878526_cykw3et0ezd.js");
// Coco App Icons
useScript("https://at.alicdn.com/t/c/font_4934333_j1t3b1xyxkk.js");
};

View File

@@ -47,6 +47,9 @@ export function useSearch() {
const aiOverviewDelay = useExtensionsStore((state) => {
return state.aiOverviewDelay;
});
const aiOverviewMinQuantity = useExtensionsStore((state) => {
return state.aiOverviewMinQuantity;
});
const { querySourceTimeout } = useConnectStore();
@@ -94,9 +97,8 @@ export function useSearch() {
const filteredData = data.filter((item: any) => {
return (
item?.document?.type !== "AI Assistant" &&
item?.document?.category !== "Calculator" &&
item?.document?.category !== "Application"
item?.source?.type === "coco-servers" &&
item?.document?.type !== "AI Assistant"
);
});
@@ -106,7 +108,7 @@ export function useSearch() {
enabledAiOverview &&
aiOverviewServer &&
aiOverviewAssistant &&
filteredData.length > 5 &&
filteredData.length >= aiOverviewMinQuantity &&
!disabledExtensions.includes("AIOverview")
) {
timerRef.current = setTimeout(() => {
@@ -118,7 +120,7 @@ export function useSearch() {
type: id,
},
document: {
index: 1000000,
index: -1,
id,
category: id,
payload: {
@@ -210,6 +212,7 @@ export function useSearch() {
disabledExtensions,
aiOverviewCharLen,
aiOverviewDelay,
aiOverviewMinQuantity,
]
);

View File

@@ -63,7 +63,7 @@ export const useStreamChat = (options: Options) => {
}
// If the chunk data does not contain a message_chunk, we ignore it
if (chunkData.message_chunk) {
if (chunkData.message_chunk.trim()) {
setVisible(true);
}

View File

@@ -1,4 +1,5 @@
import { useAppearanceStore } from "@/stores/appearanceStore";
import { useAppStore } from "@/stores/appStore";
import { useConnectStore } from "@/stores/connectStore";
import { useExtensionsStore } from "@/stores/extensionsStore";
import { useShortcutsStore } from "@/stores/shortcutsStore";
@@ -108,6 +109,14 @@ export const useSyncStore = () => {
const setAiOverviewDelay = useExtensionsStore((state) => {
return state.setAiOverviewDelay;
});
const setAiOverview = useShortcutsStore((state) => state.setAiOverview);
const setAiOverviewMinQuantity = useExtensionsStore((state) => {
return state.setAiOverviewMinQuantity;
});
const setCurrentService = useConnectStore((state) => state.setCurrentService);
const setShowTooltip = useAppStore((state) => state.setShowTooltip);
const setEndpoint = useAppStore((state) => state.setEndpoint);
const setLanguage = useAppStore((state) => state.setLanguage);
useEffect(() => {
if (!resetFixedWindow) {
@@ -137,7 +146,9 @@ export const useSyncStore = () => {
fixedWindow,
serviceList,
external,
aiOverview,
} = payload;
setModifierKey(modifierKey);
setModeSwitch(modeSwitch);
setReturnToInput(returnToInput);
@@ -154,6 +165,7 @@ export const useSyncStore = () => {
setFixedWindow(fixedWindow);
setServiceList(serviceList);
setExternal(external);
setAiOverview(aiOverview);
}),
platformAdapter.listenEvent("change-startup-store", ({ payload }) => {
@@ -168,8 +180,12 @@ export const useSyncStore = () => {
}),
platformAdapter.listenEvent("change-connect-store", ({ payload }) => {
const { connectionTimeout, querySourceTimeout, allowSelfSignature } =
payload;
const {
connectionTimeout,
querySourceTimeout,
allowSelfSignature,
currentService,
} = payload;
if (isNumber(connectionTimeout)) {
setConnectionTimeout(connectionTimeout);
}
@@ -177,6 +193,7 @@ export const useSyncStore = () => {
setQueryTimeout(querySourceTimeout);
}
setAllowSelfSignature(allowSelfSignature);
setCurrentService(currentService);
}),
platformAdapter.listenEvent("change-appearance-store", ({ payload }) => {
@@ -197,6 +214,7 @@ export const useSyncStore = () => {
disabledExtensions,
aiOverviewCharLen,
aiOverviewDelay,
aiOverviewMinQuantity,
} = payload;
setQuickAiAccessServer(quickAiAccessServer);
@@ -206,6 +224,15 @@ export const useSyncStore = () => {
setDisabledExtensions(disabledExtensions);
setAiOverviewCharLen(aiOverviewCharLen);
setAiOverviewDelay(aiOverviewDelay);
setAiOverviewMinQuantity(aiOverviewMinQuantity);
}),
platformAdapter.listenEvent("change-app-store", ({ payload }) => {
const { showTooltip, endpoint, language } = payload;
setShowTooltip(showTooltip);
setEndpoint(endpoint);
setLanguage(language);
}),
]);

View File

@@ -150,6 +150,10 @@
"hits": {
"isSystem": "This shortcut is reserved by the system, please choose another key.",
"isUse": "This shortcut is already in use, please choose another key."
},
"aiOverview": {
"title": "AI Overview",
"description": "Shortcut button to enable AI Overview in chat mode."
}
},
"connect": {
@@ -227,7 +231,36 @@
}
},
"calculator": {
"title": "Calculator"
"title": "Calculator",
"description": "A calculator you can quickly invoke in the search bar, supporting basic math operations."
},
"shardAi": {
"details": {
"linkedAssistant": {
"title": "Linked Assistant",
"label": {
"cocoServer": "Coco Server",
"aiAssistant": "AI Assistant"
}
}
}
},
"quickAiAccess": {
"description": "Quick AI access allows you to start a conversation immediately from the search box using the Tab key."
},
"aiOverview": {
"description": "AI Overview generates concise summaries based on your search results, helping you quickly grasp key information without reading every document.",
"details": {
"aiOverviewTrigger": {
"title": "AI Overview Trigger",
"description": "AI Overview will be triggered only when all of the following conditions are met.(search results are sourced from Coco Server's result statistics)",
"label": {
"minCharLen": "Minimum Input Length(characters)",
"minDelay": "Delay After Typing Stops(seconds)",
"minQuantity": "Minimum Number of Search Results"
}
}
}
}
}
},
@@ -310,7 +343,7 @@
"search": "Search Operation"
},
"askCocoAi": {
"title": "Ask {{0}}",
"title": "{{0}} {{1}}",
"placeholder": "Ask More",
"continueInChat": "Continue in chat",
"copy": "Copy"
@@ -330,6 +363,8 @@
"timedout": "Request timed out. Please try again later.",
"noServers": "No servers found",
"addServer": "Add Server",
"servers": "Servers",
"aiAssistant": "AI Assistant",
"error": "Request error. Please try again later.",
"logo_alt": "Login Logo",
"welcome": "Welcome to Coco AI",

View File

@@ -150,6 +150,10 @@
"hits": {
"isSystem": "该快捷键已被系统保留,请选择其他按键。",
"isUse": "该快捷键已被占用,请选择其他按键。"
},
"aiOverview": {
"title": "AI 总结",
"description": "在搜索模式下启用 AI 总结的快捷按键。"
}
},
"connect": {
@@ -227,7 +231,36 @@
}
},
"calculator": {
"title": "计算器"
"title": "计算器",
"description": "在搜索框中快速调用的计算工具,支持基本数学运算。"
},
"shardAi": {
"details": {
"linkedAssistant": {
"title": "关联助手",
"label": {
"cocoServer": "Coco Server",
"aiAssistant": "AI 助手"
}
}
}
},
"quickAiAccess": {
"description": "通过 Tab 键,你可以立即从搜索框中启动与 AI 的对话。"
},
"aiOverview": {
"description": "AI Overview 根据你的搜索结果生成简洁的摘要,帮助你快速掌握关键信息,无需逐一阅读每份文档。",
"details": {
"aiOverviewTrigger": {
"title": "AI Overview 触发条件",
"description": "仅当满足以下所有条件时AI Overview 才会被触发。(搜索结果来源为 Coco Server 的结果统计)",
"label": {
"minCharLen": "最小输入长度(字符)",
"minDelay": "输入停止延迟(秒)",
"minQuantity": "最小搜索结果数"
}
}
}
}
}
},
@@ -310,7 +343,7 @@
"search": "搜索操作"
},
"askCocoAi": {
"title": "{{0}}",
"title": "{{0}}{{1}}",
"placeholder": "问更多",
"continueInChat": "继续聊天",
"copy": "复制"
@@ -330,6 +363,8 @@
"timedout": "请求超时,请稍后再试。",
"noServers": "暂无可用服务器",
"addServer": "添加服务器",
"servers": "服务器",
"aiAssistant": "AI 助手",
"error": "请求错误,请稍后再试。",
"logo_alt": "登录图标",
"welcome": "欢迎使用 Coco AI",

View File

@@ -29,6 +29,7 @@ import {
import HistoryList from "@/components/Common/HistoryList";
import { useSyncStore } from "@/hooks/useSyncStore";
import { useAppStore } from "@/stores/appStore";
import { useChatStore } from "@/stores/chatStore";
interface ChatProps {}
@@ -38,10 +39,12 @@ export default function Chat({}: ChatProps) {
setIsTauri(true);
}, []);
const currentService = useConnectStore((state) => state.currentService);
const setVisibleStartPage = useConnectStore((state) => {
return state.setVisibleStartPage;
});
const {
setCurrentAssistant,
assistantList,
setVisibleStartPage,
currentService,
} = useConnectStore();
const chatAIRef = useRef<ChatAIRef>(null);
@@ -57,16 +60,22 @@ export default function Chat({}: ChatProps) {
const [isMCPActive, setIsMCPActive] = useState(false);
const [keyword, setKeyword] = useState("");
const { connected } = useChatStore();
const isChatPage = true;
useSyncStore();
useEffect(() => {
getChatHistory();
}, [keyword]);
}, [keyword, currentService?.id]);
const getChatHistory = async () => {
try {
if (!currentService.enabled) {
return setChats([]);
}
let response: any = await chat_history({
serverId: currentService?.id,
from: 0,
@@ -77,16 +86,19 @@ export default function Chat({}: ChatProps) {
console.log("_history", response);
const hits = response?.hits?.hits || [];
setChats(hits);
if (hits[0]) {
onSelectChat(hits[0]);
} else {
chatAIRef.current?.init("");
}
} catch (error) {
console.error("chat_history:", error);
}
};
useEffect(() => {
if (!currentService?.enabled) {
setActiveChat(void 0);
}
getChatHistory();
}, [currentService?.enabled, connected]);
const deleteChat = (chatId: string) => {
handleDelete(chatId);
@@ -117,6 +129,15 @@ export default function Chat({}: ChatProps) {
response = response ? JSON.parse(response) : null;
console.log("id_history", response);
const hits = response?.hits?.hits || [];
// set current assistant
const lastAssistantId = hits[hits.length - 1]?._source?.assistant_id;
const matchedAssistant = assistantList?.find(
(assistant) => assistant._id === lastAssistantId
);
if (matchedAssistant) {
setCurrentAssistant(matchedAssistant);
}
//
const updatedChat: typeChat = {
...chat,
messages: hits,
@@ -236,10 +257,7 @@ export default function Chat({}: ChatProps) {
return updatedChats;
}
return [
modifiedChat,
...updatedChats.filter((item) => item._id !== chatId),
];
return updatedChats;
});
if (activeChat?._id === chatId) {
@@ -274,7 +292,7 @@ export default function Chat({}: ChatProps) {
} transition-transform duration-300 ease-in-out md:translate-x-0 md:static md:block bg-gray-100 dark:bg-gray-800`}
>
<HistoryList
list={chats}
chats={chats}
active={activeChat}
onSearch={handleSearch}
onRefresh={getChatHistory}

View File

@@ -15,10 +15,6 @@ function MainApp() {
setIsTauri(true);
}, []);
const hideCoco = useCallback(() => {
return platformAdapter.hideWindow();
}, []);
useSyncStore();
const snapshotUpdate = useAppearanceStore((state) => state.snapshotUpdate);
@@ -41,11 +37,7 @@ function MainApp() {
return (
<>
<SearchChat
isTauri={true}
hideCoco={hideCoco}
hasModules={["search", "chat"]}
/>
<SearchChat isTauri={true} hasModules={["search", "chat"]} />
<UpdateApp checkUpdate={checkUpdate} relaunchApp={relaunchApp} />
</>
);

View File

@@ -12,6 +12,9 @@ import Footer from "@/components/Common/UI/SettingsFooter";
import { useTray } from "@/hooks/useTray";
import Advanced from "@/components/Settings/Advanced";
import Extensions from "@/components/Settings/Extensions";
import { useConnectStore } from "@/stores/connectStore";
import platformAdapter from "@/utils/platformAdapter";
import { useAppStore } from "@/stores/appStore";
const tabIndexMap: { [key: string]: number } = {
general: 0,
@@ -45,8 +48,18 @@ function SettingsPage() {
}
});
const unsubscribeConnect = useConnectStore.subscribe((state) => {
platformAdapter.emitEvent("change-connect-store", state);
});
const unsubscribeAppStore = useAppStore.subscribe((state) => {
platformAdapter.emitEvent("change-app-store", state);
});
return () => {
unlisten.then((fn) => fn());
unsubscribeConnect();
unsubscribeAppStore();
};
}, []);

View File

@@ -1,118 +1,143 @@
# SearchChat Web Component API
## Props
A customizable search and chat interface component for web applications.
### `serverUrl`
- **Type**: `string`
- **Optional**: Yes
- **Default**: `""`
- **Description**: Set the server address
## Installation
### `headers`
- **Type**: `Record<string, unknown>`
- **Optional**: Yes
- **Default**: `{}`
- **Description**: Request header configuration for API calls, such as X-API-TOKEN and APP-INTEGRATION-ID
```bash
npm install @infini/coco-app
```
### `width`
- **Type**: `number`
- **Optional**: Yes
- **Default**: `680`
- **Description**: Width of the component container in pixels
## Basic Usage
### `height`
- **Type**: `number`
- **Optional**: Yes
- **Default**: `590`
- **Description**: Height of the component container in pixels. On mobile devices, it automatically adapts to the viewport height
### `hasModules`
- **Type**: `string[]`
- **Optional**: Yes
- **Default**: `['search', 'chat']`
- **Description**: List of enabled feature modules, currently supports 'search' and 'chat' modules
### `defaultModule`
- **Type**: `'search' | 'chat'`
- **Optional**: Yes
- **Default**: `'search'`
- **Description**: The default module to display
### `assistantIDs`
- **Type**: `string[]`
- **Optional**: Yes
- **Default**: `[]`
- **Description**: List of available assistant IDs
### `hideCoco`
- **Type**: `() => void`
- **Optional**: Yes
- **Default**: `() => {}`
- **Description**: Callback function to hide the search window
### `theme`
- **Type**: `"auto" | "light" | "dark"`
- **Optional**: Yes
- **Default**: `"dark"`
- **Description**: Theme setting, supports auto (follows system), light, and dark modes
### `searchPlaceholder`
- **Type**: `string`
- **Optional**: Yes
- **Default**: `""`
- **Description**: Placeholder text for the search input
### `chatPlaceholder`
- **Type**: `string`
- **Optional**: Yes
- **Default**: `""`
- **Description**: Placeholder text for the chat input
### `showChatHistory`
- **Type**: `boolean`
- **Optional**: Yes
- **Default**: `false`
- **Description**: Whether to display chat history
### `setIsPinned`
- **Type**: `(value: boolean) => void`
- **Optional**: Yes
- **Default**: `undefined`
- **Description**: Callback function to set window pin status
### `onCancel`
- **Type**: `() => void`
- **Optional**: Yes
- **Default**: `undefined`
- **Description**: Callback function for clicking the close button on mobile devices
## Usage Example
```tsx
import SearchChat from 'search-chat';
```jsx
import SearchChat from '@infini/coco-app';
function App() {
return (
<SearchChat
serverUrl=""
<SearchChat
serverUrl="https://your-server.com"
headers={{
"X-API-TOKEN": "your-api-token",
"APP-INTEGRATION-ID": "your-integration-id"
"X-API-TOKEN": "your-token",
"APP-INTEGRATION-ID": "your-app-id"
}}
width={680}
height={590}
hasModules={['search', 'chat']}
defaultModule="search"
assistantIDs={[]}
hideCoco={() => console.log('hide')}
theme="dark"
searchPlaceholder=""
chatPlaceholder=""
showChatHistory={false}
setIsPinned={(isPinned) => console.log('isPinned:', isPinned)}
onCancel={() => console.log('cancel')}
/>
);
}
```
## Props
### `width`
- **Type**: `number`
- **Default**: `680`
- **Description**: Maximum width of the component in pixels
### `height`
- **Type**: `number`
- **Default**: `590`
- **Description**: Height of the component in pixels
### `headers`
- **Type**: `Record<string, unknown>`
- **Default**:
```typescript
{
"X-API-TOKEN": "default-token",
"APP-INTEGRATION-ID": "default-id"
}
```
- **Description**: HTTP headers for API requests
### `serverUrl`
- **Type**: `string`
- **Default**: `""`
- **Description**: Base URL for the server API
### `hasModules`
- **Type**: `string[]`
- **Default**: `["search", "chat"]`
- **Description**: Available modules to show
### `defaultModule`
- **Type**: `"search" | "chat"`
- **Default**: `"search"`
- **Description**: Initial active module
### `assistantIDs`
- **Type**: `string[]`
- **Default**: `[]`
- **Description**: List of assistant IDs to use
### `theme`
- **Type**: `"auto" | "light" | "dark"`
- **Default**: `"dark"`
- **Description**: UI theme setting
### `searchPlaceholder`
- **Type**: `string`
- **Default**: `""`
- **Description**: Placeholder text for search input
### `chatPlaceholder`
- **Type**: `string`
- **Default**: `""`
- **Description**: Placeholder text for chat input
### `showChatHistory`
- **Type**: `boolean`
- **Default**: `false`
- **Description**: Whether to display chat history panel
### `startPage`
- **Type**: `StartPage`
- **Optional**: Yes
- **Description**: Initial page configuration
### `setIsPinned`
- **Type**: `(value: boolean) => void`
- **Optional**: Yes
- **Description**: Callback when pin status changes
### `onCancel`
- **Type**: `() => void`
- **Optional**: Yes
- **Description**: Callback when close button is clicked (mobile only)
### `isOpen`
- **Type**: `boolean`
- **Optional**: Yes
- **Description**: Control component visibility
## Events
The component emits the following events:
- `onModeChange`: Triggered when switching between search and chat modes
- `onCancel`: Triggered when the close button is clicked (mobile only)
## Mobile Support
The component is responsive and includes mobile-specific features:
- Automatic height adjustment
- Close button in top-right corner
- Touch-friendly interface
## Example
```jsx
<SearchChat
width={800}
height={600}
serverUrl="https://api.example.com"
headers={{
"X-API-TOKEN": "your-token",
"APP-INTEGRATION-ID": "your-app-id"
}}
theme="dark"
showChatHistory={true}
hasModules={["search", "chat"]}
defaultModule="chat"
setIsPinned={(isPinned) => console.log('Pinned:', isPinned)}
/>
```

View File

@@ -21,7 +21,6 @@ interface WebAppProps {
hasModules?: string[];
defaultModule?: "search" | "chat";
assistantIDs?: string[];
hideCoco?: () => void;
theme?: "auto" | "light" | "dark";
searchPlaceholder?: string;
chatPlaceholder?: string;
@@ -29,6 +28,7 @@ interface WebAppProps {
startPage?: StartPage;
setIsPinned?: (value: boolean) => void;
onCancel?: () => void;
isOpen?: boolean;
}
function WebApp({
@@ -43,7 +43,6 @@ function WebApp({
// token = "cvqt6r02sdb2v3bkgip0x3ixv01f3r2lhnxoz1efbn160wm9og58wtv8t6wrv1ebvnvypuc23dx9pb33aemh", // http://localhost:9000
// token = "cv5djeb9om602jdvtnmg6kc1muyn2vcadr6te48j9t9pvt59ewrnwj7fwvxrw3va84j2a0lb5y8194fbr3jd", // http://43.153.113.88:9000
serverUrl = "",
hideCoco = () => {},
hasModules = ["search", "chat"],
defaultModule = "search",
assistantIDs = [],
@@ -110,7 +109,6 @@ function WebApp({
)}
<SearchChat
isTauri={false}
hideCoco={hideCoco}
hasModules={hasModules}
defaultModule={defaultModule}
theme={theme}

View File

@@ -15,10 +15,13 @@ export type AppAction =
| { type: "SET_CHAT_MODE"; payload: boolean }
| { type: "SET_INPUT"; payload: string }
| { type: "TOGGLE_SEARCH_ACTIVE" }
| { type: "SET_SEARCH_ACTIVE"; payload: boolean }
| { type: "TOGGLE_DEEP_THINK_ACTIVE" }
| { type: "SET_DEEP_THINK_ACTIVE"; payload: boolean }
| { type: "TOGGLE_MCP_ACTIVE" }
| { type: "SET_MCP_ACTIVE"; payload: boolean }
| { type: "SET_TYPING"; payload: boolean }
| { type: "SET_LOADING"; payload: boolean };
| { type: "SET_LOADING"; payload: boolean }
const getCachedChatMode = (): boolean => {
const { defaultStartupWindow } = useStartupStore.getState();
@@ -49,10 +52,16 @@ export function appReducer(state: AppState, action: AppAction): AppState {
return { ...state, input: action.payload };
case "TOGGLE_SEARCH_ACTIVE":
return { ...state, isSearchActive: !state.isSearchActive };
case "SET_SEARCH_ACTIVE":
return { ...state, isSearchActive: action.payload };
case "TOGGLE_DEEP_THINK_ACTIVE":
return { ...state, isDeepThinkActive: !state.isDeepThinkActive };
case "SET_DEEP_THINK_ACTIVE":
return { ...state, isDeepThinkActive: action.payload };
case "TOGGLE_MCP_ACTIVE":
return { ...state, isMCPActive: !state.isMCPActive };
case "SET_MCP_ACTIVE":
return { ...state, isMCPActive: action.payload };
case "SET_TYPING":
return { ...state, isTyping: action.payload };
case "SET_LOADING":

View File

@@ -1,7 +1,12 @@
import { useEffect } from "react";
import { Outlet, useLocation } from "react-router-dom";
import { useTranslation } from "react-i18next";
import { useAsyncEffect, useEventListener, useMount } from "ahooks";
import {
useAsyncEffect,
useEventListener,
useMount,
useTextSelection,
} from "ahooks";
import { isArray, isString } from "lodash-es";
import { error } from "@tauri-apps/plugin-log";
@@ -40,6 +45,7 @@ export default function Layout() {
const unlistenTheme = await platformAdapter.listenThemeChanged(
(theme: AppTheme) => {
setTheme(theme);
setIsDark(theme === "dark");
}
);
@@ -82,31 +88,15 @@ export default function Layout() {
const { i18n } = useTranslation();
const language = useAppStore((state) => state.language);
const { text: selectionText } = useTextSelection();
useEffect(() => {
if (language) {
i18n.changeLanguage(language);
}
const setupLanguageListener = async () => {
const unlisten = await platformAdapter.listenEvent(
"language-changed",
(event) => {
i18n.changeLanguage(event.payload.language);
}
);
return unlisten;
};
const unlistenPromise = setupLanguageListener();
return () => {
unlistenPromise.then((unlisten) => unlisten());
};
}, []);
i18n.changeLanguage(language);
}, [language]);
// Disable right-click for production environment
useEventListener("contextmenu", (event) => {
if (import.meta.env.DEV) return;
if (import.meta.env.DEV || selectionText) return;
event.preventDefault();
});

View File

@@ -1,10 +1,7 @@
import { create } from "zustand";
import { persist } from "zustand/middleware";
import { persist, subscribeWithSelector } from "zustand/middleware";
import { AppEndpoint } from "@/types/index";
import platformAdapter from "@/utils/platformAdapter";
const ENDPOINT_CHANGE_EVENT = "endpoint-changed";
interface ErrorMessage {
id: string;
@@ -33,7 +30,6 @@ export type IAppStore = {
setLanguage: (language: string) => void;
isPinned: boolean;
setIsPinned: (isPinned: boolean) => void;
initializeListeners: () => Promise<() => void>;
showCocoShortcuts: string[];
setShowCocoShortcuts: (showCocoShortcuts: string[]) => void;
@@ -49,105 +45,93 @@ export type IAppStore = {
};
export const useAppStore = create<IAppStore>()(
persist(
(set) => ({
showTooltip: true,
setShowTooltip: (showTooltip: boolean) => set({ showTooltip }),
errors: [],
addError: (
message: string,
type: "error" | "warning" | "info" = "error"
) =>
set((state) => {
const newError = {
id: Date.now().toString(),
type,
message,
timestamp: Date.now(),
};
const updatedErrors = [newError, ...state.errors].slice(0, 5);
return { errors: updatedErrors };
}),
removeError: (id: string) =>
set((state) => ({
errors: state.errors.filter((error) => error.id !== id),
})),
clearErrors: () => set({ errors: [] }),
subscribeWithSelector(
persist(
(set) => ({
showTooltip: true,
setShowTooltip: async (showTooltip: boolean) => {
return set({ showTooltip });
},
errors: [],
addError: (
message: string,
type: "error" | "warning" | "info" = "error"
) =>
set((state) => {
const newError = {
id: Date.now().toString(),
type,
message,
timestamp: Date.now(),
};
const updatedErrors = [newError, ...state.errors].slice(0, 5);
return { errors: updatedErrors };
}),
removeError: (id: string) =>
set((state) => ({
errors: state.errors.filter((error) => error.id !== id),
})),
clearErrors: () => set({ errors: [] }),
ssoRequestID: "",
setSSORequestID: (ssoRequestID: string) => set({ ssoRequestID }),
ssoRequestID: "",
setSSORequestID: (ssoRequestID: string) => set({ ssoRequestID }),
endpoint: "https://coco.infini.cloud/",
endpoint_http: "https://coco.infini.cloud",
endpoint_websocket: "wss://coco.infini.cloud/ws",
setEndpoint: async (endpoint: AppEndpoint) => {
const endpoint_http = endpoint;
endpoint: "https://coco.infini.cloud/",
endpoint_http: "https://coco.infini.cloud",
endpoint_websocket: "wss://coco.infini.cloud/ws",
setEndpoint: async (endpoint: AppEndpoint) => {
const endpoint_http = endpoint;
const withoutProtocol = endpoint.split("//")[1];
const withoutProtocol = endpoint.split("//")[1];
const endpoint_websocket = endpoint?.includes("https")
? `wss://${withoutProtocol}/ws`
: `ws://${withoutProtocol}/ws`;
const endpoint_websocket = endpoint?.includes("https")
? `wss://${withoutProtocol}/ws`
: `ws://${withoutProtocol}/ws`;
set({
endpoint,
endpoint_http,
endpoint_websocket,
});
return set({
endpoint,
endpoint_http,
endpoint_websocket,
});
},
language: "en",
setLanguage: (language: string) => set({ language }),
isPinned: false,
setIsPinned: (isPinned: boolean) => set({ isPinned }),
showCocoShortcuts: [],
setShowCocoShortcuts: (showCocoShortcuts: string[]) => {
console.log("set showCocoShortcuts", showCocoShortcuts);
await platformAdapter.emitEvent(ENDPOINT_CHANGE_EVENT, {
endpoint,
endpoint_http,
endpoint_websocket,
});
},
language: "en",
setLanguage: (language: string) => set({ language }),
isPinned: false,
setIsPinned: (isPinned: boolean) => set({ isPinned }),
initializeListeners: () => {
return platformAdapter.listenEvent(
ENDPOINT_CHANGE_EVENT,
(event: any) => {
const { endpoint, endpoint_http, endpoint_websocket } =
event.payload;
set({ endpoint, endpoint_http, endpoint_websocket });
}
);
},
showCocoShortcuts: [],
setShowCocoShortcuts: (showCocoShortcuts: string[]) => {
console.log("set showCocoShortcuts", showCocoShortcuts);
return set({ showCocoShortcuts });
},
isTauri: true,
setIsTauri: (isTauri: boolean) => set({ isTauri }),
visible: false,
withVisibility: async <T>(fn: () => Promise<T>) => {
set({ visible: true });
return set({ showCocoShortcuts });
},
isTauri: true,
setIsTauri: (isTauri: boolean) => set({ isTauri }),
visible: false,
withVisibility: async <T>(fn: () => Promise<T>) => {
set({ visible: true });
const result = await fn();
const result = await fn();
set({ visible: false });
set({ visible: false });
return result;
},
return result;
},
blurred: false,
setBlurred: (blurred: boolean) => set({ blurred }),
}),
{
name: "app-store",
partialize: (state) => ({
isTauri: state.isTauri,
showTooltip: state.showTooltip,
ssoRequestID: state.ssoRequestID,
endpoint: state.endpoint,
endpoint_http: state.endpoint_http,
endpoint_websocket: state.endpoint_websocket,
language: state.language,
blurred: false,
setBlurred: (blurred: boolean) => set({ blurred }),
}),
}
{
name: "app-store",
partialize: (state) => ({
isTauri: state.isTauri,
showTooltip: state.showTooltip,
ssoRequestID: state.ssoRequestID,
endpoint: state.endpoint,
endpoint_http: state.endpoint_http,
endpoint_websocket: state.endpoint_websocket,
language: state.language,
}),
}
)
)
);

View File

@@ -14,7 +14,7 @@ export const useAppearanceStore = create<IAppearanceStore>()(
(set) => ({
opacity: 30,
setOpacity: (opacity) => {
return set({ opacity: opacity || 30 });
return set({ opacity: opacity });
},
snapshotUpdate: false,
setSnapshotUpdate: (snapshotUpdate) => {

Some files were not shown because too many files have changed in this diff Show More