diff --git a/RELEASE_NOTES_v0.3.0.md b/RELEASE_NOTES_v0.3.0.md new file mode 100644 index 0000000..fe9b398 --- /dev/null +++ b/RELEASE_NOTES_v0.3.0.md @@ -0,0 +1,74 @@ +# Hikari Desktop v0.3.0 Release Notes + +## New Features + +### AskUserQuestion Tool Support (#51) + +- Claude can now ask you questions with multiple choice options during conversations +- A dedicated modal appears with answer choices and support for custom responses +- Answers are seamlessly integrated back into the conversation context + +### Slash Commands + +- `/cd ` - Change the working directory while preserving conversation context (#55) +- `/search ` - Search and highlight matches within the conversation (#32) +- `/skill [data]` - Invoke Claude Code skills from `~/.claude/skills/` (#57) +- `/new`, `/clear`, `/rename`, `/help` commands for conversation management (#6) + +### Auto-Update Checker (#17) + +- Automatically checks for new releases on startup +- Notification appears when a newer version is available +- Can be disabled in settings + +### Font Size & Zoom (#19) + +- Adjust font size with keyboard shortcuts: `Ctrl++`, `Ctrl+-`, `Ctrl+0` +- Font size slider in settings (10-24px range) +- Preference persists between sessions + +### Resizable Character Panel (#10) + +- Drag the divider between the character panel and terminal to resize +- Panel width is saved and restored on app restart +- Sprite now uses full height for better proportions + +### Input History Navigation (#13) + +- Use up/down arrows to navigate through previous messages and commands +- Arrow keys only navigate history when input is empty - otherwise they move the cursor (#58) + +### Keyboard Shortcuts (#21) + +- `Ctrl+N` - New conversation +- `Ctrl+W` - Close current tab +- `Ctrl+Tab` / `Ctrl+Shift+Tab` - Switch between tabs +- `Ctrl+L` - Clear conversation +- `Ctrl+,` - Open settings + +### Always On Top Toggle (#28) + +- Pin the window to stay above other applications +- Toggle in settings + +## Improvements + +### UI/UX + +- Resizable chat input with drag handle (expands upward) +- Send button properly aligned with input field +- Markdown rendering with syntax-highlighted code blocks (#31, #33) +- Light mode text colors improved for better readability +- Scroll position persists per conversation tab when switching +- Confirmation modal when closing connected tabs +- Links in chat now open in default browser (#54) +- Spaces allowed when renaming tabs (#52) + +### State Management + +- Stats (tokens, cost) persist across session changes and only reset on disconnect (#59) +- Multiple tabs can now request permissions simultaneously without conflicts + +## Closed Issues + +#6, #10, #13, #17, #19, #21, #28, #31, #32, #33, #51, #52, #54, #55, #57, #58, #59 diff --git a/package.json b/package.json index 5509669..42fca6d 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "license": "MIT", "dependencies": { "@tauri-apps/api": "^2", + "@tauri-apps/plugin-clipboard-manager": "^2.3.2", "@tauri-apps/plugin-dialog": "^2", "@tauri-apps/plugin-notification": "^2", "@tauri-apps/plugin-opener": "^2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 95070cc..2bc5ddd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: '@tauri-apps/api': specifier: ^2 version: 2.9.1 + '@tauri-apps/plugin-clipboard-manager': + specifier: ^2.3.2 + version: 2.3.2 '@tauri-apps/plugin-dialog': specifier: ^2 version: 2.6.0 @@ -735,6 +738,9 @@ packages: engines: {node: '>= 10'} hasBin: true + '@tauri-apps/plugin-clipboard-manager@2.3.2': + resolution: {integrity: sha512-CUlb5Hqi2oZbcZf4VUyUH53XWPPdtpw43EUpCza5HWZJwxEoDowFzNUDt1tRUXA8Uq+XPn17Ysfptip33sG4eQ==} + '@tauri-apps/plugin-dialog@2.6.0': resolution: {integrity: sha512-q4Uq3eY87TdcYzXACiYSPhmpBA76shgmQswGkSVio4C82Sz2W4iehe9TnKYwbq7weHiL88Yw19XZm7v28+Micg==} @@ -2286,6 +2292,10 @@ snapshots: '@tauri-apps/cli-win32-ia32-msvc': 2.9.6 '@tauri-apps/cli-win32-x64-msvc': 2.9.6 + '@tauri-apps/plugin-clipboard-manager@2.3.2': + dependencies: + '@tauri-apps/api': 2.9.1 + '@tauri-apps/plugin-dialog@2.6.0': dependencies: '@tauri-apps/api': 2.9.1 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 85f26b9..3ed5bd2 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -47,6 +47,27 @@ version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" +[[package]] +name = "arboard" +version = "3.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf" +dependencies = [ + "clipboard-win", + "image", + "log", + "objc2", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation", + "parking_lot", + "percent-encoding", + "windows-sys 0.60.2", + "wl-clipboard-rs", + "x11rb", +] + [[package]] name = "async-broadcast" version = "0.7.2" @@ -310,6 +331,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" version = "1.11.0" @@ -449,6 +476,15 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "clipboard-win" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4" +dependencies = [ + "error-code", +] + [[package]] name = "combine" version = "4.6.7" @@ -604,6 +640,12 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +[[package]] +name = "crunchy" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" + [[package]] name = "crypto-common" version = "0.1.7" @@ -807,6 +849,12 @@ dependencies = [ "litrs", ] +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + [[package]] name = "dpi" version = "0.1.2" @@ -926,6 +974,12 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "error-code" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" + [[package]] name = "event-listener" version = "5.4.1" @@ -953,6 +1007,26 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "fax" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" +dependencies = [ + "fax_derive", +] + +[[package]] +name = "fax_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "fdeflate" version = "0.3.7" @@ -978,6 +1052,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41" +[[package]] +name = "fixedbitset" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" + [[package]] name = "flate2" version = "1.1.8" @@ -994,6 +1074,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "foreign-types" version = "0.5.0" @@ -1458,12 +1544,32 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" +dependencies = [ + "cfg-if", + "crunchy", + "zerocopy", +] + [[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash", +] + [[package]] name = "hashbrown" version = "0.16.1" @@ -1496,7 +1602,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hikari-desktop" -version = "0.2.0" +version = "0.3.0" dependencies = [ "chrono", "parking_lot", @@ -1505,6 +1611,7 @@ dependencies = [ "serde_json", "tauri", "tauri-build", + "tauri-plugin-clipboard-manager", "tauri-plugin-dialog", "tauri-plugin-http", "tauri-plugin-notification", @@ -1665,7 +1772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98" dependencies = [ "byteorder", - "png", + "png 0.17.16", ] [[package]] @@ -1776,6 +1883,20 @@ dependencies = [ "icu_properties", ] +[[package]] +name = "image" +version = "0.25.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a" +dependencies = [ + "bytemuck", + "byteorder-lite", + "moxcms", + "num-traits", + "png 0.18.0", + "tiff", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -2135,6 +2256,16 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "moxcms" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97" +dependencies = [ + "num-traits", + "pxfm", +] + [[package]] name = "muda" version = "0.17.1" @@ -2150,7 +2281,7 @@ dependencies = [ "objc2-core-foundation", "objc2-foundation", "once_cell", - "png", + "png 0.17.16", "serde", "thiserror 2.0.17", "windows-sys 0.60.2", @@ -2210,6 +2341,15 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +[[package]] +name = "nom" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" +dependencies = [ + "memchr", +] + [[package]] name = "notify-rust" version = "4.11.7" @@ -2628,6 +2768,17 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +[[package]] +name = "petgraph" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" +dependencies = [ + "fixedbitset", + "hashbrown 0.15.5", + "indexmap 2.13.0", +] + [[package]] name = "phf" version = "0.8.0" @@ -2817,6 +2968,19 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "png" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0" +dependencies = [ + "bitflags 2.10.0", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + [[package]] name = "polling" version = "3.11.0" @@ -2945,6 +3109,21 @@ dependencies = [ "psl-types", ] +[[package]] +name = "pxfm" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8" +dependencies = [ + "num-traits", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quick-xml" version = "0.37.5" @@ -4068,7 +4247,7 @@ dependencies = [ "ico", "json-patch", "plist", - "png", + "png 0.17.16", "proc-macro2", "quote", "semver", @@ -4115,6 +4294,21 @@ dependencies = [ "walkdir", ] +[[package]] +name = "tauri-plugin-clipboard-manager" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206dc20af4ed210748ba945c2774e60fd0acd52b9a73a028402caf809e9b6ecf" +dependencies = [ + "arboard", + "log", + "serde", + "serde_json", + "tauri", + "tauri-plugin", + "thiserror 2.0.17", +] + [[package]] name = "tauri-plugin-dialog" version = "2.6.0" @@ -4452,6 +4646,20 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "tiff" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f" +dependencies = [ + "fax", + "flate2", + "half", + "quick-error", + "weezl", + "zune-jpeg", +] + [[package]] name = "time" version = "0.3.45" @@ -4747,12 +4955,23 @@ dependencies = [ "objc2-core-graphics", "objc2-foundation", "once_cell", - "png", + "png 0.17.16", "serde", "thiserror 2.0.17", "windows-sys 0.60.2", ] +[[package]] +name = "tree_magic_mini" +version = "3.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6" +dependencies = [ + "memchr", + "nom", + "petgraph", +] + [[package]] name = "try-lock" version = "0.2.5" @@ -5034,6 +5253,76 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wayland-backend" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec" +dependencies = [ + "bitflags 2.10.0", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3" +dependencies = [ + "proc-macro2", + "quick-xml 0.38.4", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd" +dependencies = [ + "pkg-config", +] + [[package]] name = "web-sys" version = "0.3.85" @@ -5143,6 +5432,12 @@ dependencies = [ "windows-core 0.61.2", ] +[[package]] +name = "weezl" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" + [[package]] name = "winapi" version = "0.3.9" @@ -5673,6 +5968,24 @@ version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +[[package]] +name = "wl-clipboard-rs" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3" +dependencies = [ + "libc", + "log", + "os_pipe", + "rustix", + "thiserror 2.0.17", + "tree_magic_mini", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", +] + [[package]] name = "writeable" version = "0.6.2" @@ -5745,6 +6058,23 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "x11rb" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414" +dependencies = [ + "gethostname", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" + [[package]] name = "yoke" version = "0.8.1" @@ -5915,6 +6245,21 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea" +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" +dependencies = [ + "zune-core", +] + [[package]] name = "zvariant" version = "5.9.1" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 5c3573e..5ac4de4 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -26,6 +26,7 @@ tauri-plugin-store = "2.4.2" tauri-plugin-notification = "2" tauri-plugin-os = "2" tauri-plugin-http = "2" +tauri-plugin-clipboard-manager = "2" tempfile = "3" semver = "1" chrono = { version = "0.4.43", features = ["serde"] } diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index 5e2db1c..5e067ad 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -13,6 +13,8 @@ "notification:default", "notification:allow-is-permission-granted", "notification:allow-request-permission", - "notification:allow-notify" + "notification:allow-notify", + "clipboard-manager:default", + "clipboard-manager:allow-read-image" ] } diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs index 2b3ce85..75373db 100644 --- a/src-tauri/src/commands.rs +++ b/src-tauri/src/commands.rs @@ -1,3 +1,4 @@ +use std::path::PathBuf; use tauri::{AppHandle, State}; use tauri_plugin_http::reqwest; use tauri_plugin_store::StoreExt; @@ -6,6 +7,7 @@ use crate::achievements::{get_achievement_info, load_achievements, AchievementUn use crate::bridge_manager::SharedBridgeManager; use crate::config::{ClaudeStartOptions, HikariConfig}; use crate::stats::UsageStats; +use crate::temp_manager::SharedTempFileManager; const CONFIG_STORE_KEY: &str = "config"; @@ -298,3 +300,83 @@ pub async fn check_for_updates() -> Result { release_notes: latest.body.clone(), }) } + +#[derive(Debug, Clone, serde::Serialize)] +pub struct SavedFileInfo { + pub path: String, + pub filename: String, +} + +#[tauri::command] +pub async fn save_temp_file( + temp_manager: State<'_, SharedTempFileManager>, + conversation_id: String, + data: Vec, + filename: Option, +) -> Result { + let mut manager = temp_manager.lock(); + let path = manager.save_file(&conversation_id, &data, filename.as_deref())?; + + let filename = path + .file_name() + .map(|n| n.to_string_lossy().to_string()) + .unwrap_or_else(|| "unknown".to_string()); + + Ok(SavedFileInfo { + path: path.to_string_lossy().to_string(), + filename, + }) +} + +#[tauri::command] +pub async fn register_temp_file( + temp_manager: State<'_, SharedTempFileManager>, + conversation_id: String, + file_path: String, +) -> Result<(), String> { + let mut manager = temp_manager.lock(); + manager.register_file(&conversation_id, PathBuf::from(file_path)); + Ok(()) +} + +#[tauri::command] +pub async fn get_temp_files( + temp_manager: State<'_, SharedTempFileManager>, + conversation_id: String, +) -> Result, String> { + let manager = temp_manager.lock(); + let files = manager.get_files_for_conversation(&conversation_id); + Ok(files.iter().map(|p| p.to_string_lossy().to_string()).collect()) +} + +#[tauri::command] +pub async fn cleanup_temp_files( + temp_manager: State<'_, SharedTempFileManager>, + conversation_id: String, +) -> Result<(), String> { + let mut manager = temp_manager.lock(); + manager.cleanup_conversation(&conversation_id) +} + +#[tauri::command] +pub async fn cleanup_all_temp_files( + temp_manager: State<'_, SharedTempFileManager>, +) -> Result<(), String> { + let mut manager = temp_manager.lock(); + manager.cleanup_all() +} + +#[tauri::command] +pub async fn cleanup_orphaned_temp_files( + temp_manager: State<'_, SharedTempFileManager>, +) -> Result { + let mut manager = temp_manager.lock(); + manager.cleanup_orphaned_files() +} + +#[tauri::command] +pub async fn get_file_size(file_path: String) -> Result { + let metadata = std::fs::metadata(&file_path) + .map_err(|e| format!("Failed to get file metadata: {}", e))?; + Ok(metadata.len()) +} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 685d3da..f635d4d 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -4,6 +4,7 @@ mod commands; mod config; mod notifications; mod stats; +mod temp_manager; mod types; mod vbs_notification; mod windows_toast; @@ -14,6 +15,7 @@ use bridge_manager::create_shared_bridge_manager; use commands::load_saved_achievements; use commands::*; use notifications::*; +use temp_manager::create_shared_temp_manager; use vbs_notification::*; use windows_toast::*; use wsl_notifications::*; @@ -21,6 +23,7 @@ use wsl_notifications::*; #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { let bridge_manager = create_shared_bridge_manager(); + let temp_manager = create_shared_temp_manager().expect("Failed to create temp file manager"); tauri::Builder::default() .plugin(tauri_plugin_dialog::init()) @@ -30,10 +33,20 @@ pub fn run() { .plugin(tauri_plugin_notification::init()) .plugin(tauri_plugin_os::init()) .plugin(tauri_plugin_http::init()) + .plugin(tauri_plugin_clipboard_manager::init()) .manage(bridge_manager.clone()) + .manage(temp_manager.clone()) .setup(move |app| { // Initialize the app handle in the bridge manager bridge_manager.lock().set_app_handle(app.handle().clone()); + + // Clean up any orphaned temp files from previous sessions + if let Ok(count) = temp_manager.lock().cleanup_orphaned_files() { + if count > 0 { + println!("Cleaned up {} orphaned temp files", count); + } + } + Ok(()) }) .invoke_handler(tauri::generate_handler![ @@ -58,6 +71,13 @@ pub fn run() { validate_directory, list_skills, check_for_updates, + save_temp_file, + register_temp_file, + get_temp_files, + cleanup_temp_files, + cleanup_all_temp_files, + cleanup_orphaned_temp_files, + get_file_size, ]) .run(tauri::generate_context!()) .expect("error while running tauri application"); diff --git a/src-tauri/src/temp_manager.rs b/src-tauri/src/temp_manager.rs new file mode 100644 index 0000000..cfc8cea --- /dev/null +++ b/src-tauri/src/temp_manager.rs @@ -0,0 +1,139 @@ +use parking_lot::Mutex; +use std::collections::HashMap; +use std::fs; +use std::path::{Path, PathBuf}; +use std::sync::Arc; +use uuid::Uuid; + +const TEMP_DIR_NAME: &str = "hikari-uploads"; + +pub struct TempFileManager { + base_dir: PathBuf, + files: HashMap>, +} + +impl TempFileManager { + pub fn new() -> Result { + let base_dir = std::env::temp_dir().join(TEMP_DIR_NAME); + + if !base_dir.exists() { + fs::create_dir_all(&base_dir) + .map_err(|e| format!("Failed to create temp directory: {}", e))?; + } + + Ok(TempFileManager { + base_dir, + files: HashMap::new(), + }) + } + + #[allow(dead_code)] + pub fn get_base_dir(&self) -> &Path { + &self.base_dir + } + + pub fn save_file( + &mut self, + conversation_id: &str, + data: &[u8], + original_filename: Option<&str>, + ) -> Result { + let unique_id = Uuid::new_v4(); + let extension = original_filename + .and_then(|name| Path::new(name).extension()) + .and_then(|ext| ext.to_str()) + .unwrap_or("bin"); + + let filename = format!("{}_{}.{}", conversation_id, unique_id, extension); + let file_path = self.base_dir.join(&filename); + + fs::write(&file_path, data) + .map_err(|e| format!("Failed to write temp file: {}", e))?; + + self.files + .entry(conversation_id.to_string()) + .or_default() + .push(file_path.clone()); + + Ok(file_path) + } + + pub fn register_file(&mut self, conversation_id: &str, file_path: PathBuf) { + self.files + .entry(conversation_id.to_string()) + .or_default() + .push(file_path); + } + + pub fn get_files_for_conversation(&self, conversation_id: &str) -> Vec { + self.files + .get(conversation_id) + .cloned() + .unwrap_or_default() + } + + pub fn cleanup_conversation(&mut self, conversation_id: &str) -> Result<(), String> { + if let Some(files) = self.files.remove(conversation_id) { + for file_path in files { + if file_path.exists() { + if let Err(e) = fs::remove_file(&file_path) { + eprintln!( + "Warning: Failed to remove temp file {:?}: {}", + file_path, e + ); + } + } + } + } + Ok(()) + } + + pub fn cleanup_all(&mut self) -> Result<(), String> { + let conversation_ids: Vec = self.files.keys().cloned().collect(); + + for conversation_id in conversation_ids { + self.cleanup_conversation(&conversation_id)?; + } + + Ok(()) + } + + pub fn cleanup_orphaned_files(&mut self) -> Result { + let mut cleaned_count = 0; + + if !self.base_dir.exists() { + return Ok(0); + } + + let tracked_files: std::collections::HashSet = + self.files.values().flatten().cloned().collect(); + + let entries = fs::read_dir(&self.base_dir) + .map_err(|e| format!("Failed to read temp directory: {}", e))?; + + for entry in entries.flatten() { + let path = entry.path(); + if path.is_file() && !tracked_files.contains(&path) { + if let Err(e) = fs::remove_file(&path) { + eprintln!("Warning: Failed to remove orphaned file {:?}: {}", path, e); + } else { + cleaned_count += 1; + } + } + } + + Ok(cleaned_count) + } +} + +impl Default for TempFileManager { + fn default() -> Self { + Self::new().expect("Failed to create TempFileManager") + } +} + +pub type SharedTempFileManager = Arc>; + +pub fn create_shared_temp_manager() -> Result { + Ok(Arc::new(Mutex::new(TempFileManager::new()?))) +} diff --git a/src/lib/components/AttachmentPreview.svelte b/src/lib/components/AttachmentPreview.svelte new file mode 100644 index 0000000..b3ca414 --- /dev/null +++ b/src/lib/components/AttachmentPreview.svelte @@ -0,0 +1,209 @@ + + +{#if attachments.length > 0} +
+
+ {attachments.length} attachment{attachments.length !== 1 ? "s" : ""} +
+
+ {#each attachments as attachment (attachment.id)} +
+ {#if attachment.type === "image" && attachment.previewUrl} +
+ {attachment.filename} +
+ {:else} +
+ {getFileIcon(attachment.type)} +
+ {/if} +
+ + {attachment.filename} + + + {formatFileSize(attachment.size)} + +
+ +
+ {/each} +
+
+{/if} + + diff --git a/src/lib/components/InputBar.svelte b/src/lib/components/InputBar.svelte index 7313c06..1fe7461 100644 --- a/src/lib/components/InputBar.svelte +++ b/src/lib/components/InputBar.svelte @@ -1,5 +1,7 @@ -
+ + +
@@ -370,6 +708,7 @@ User: ${formattedMessage}`; bind:value={inputValue} onkeydown={handleKeyDown} oninput={handleInputChange} + onpaste={handlePaste} placeholder={isConnected ? "Ask Hikari anything... (type / for commands)" : "Connect to Claude first..."} @@ -384,6 +723,23 @@ User: ${formattedMessage}`;
+ + {#if isProcessing}