From f6e647ad4e4d5952920df5dd6ba370c8d05e3077 Mon Sep 17 00:00:00 2001 From: kaichaosun Date: Thu, 16 Apr 2026 08:50:45 +0800 Subject: [PATCH] chore: fix long intro copy to clipboard --- Cargo.lock | 350 ++++++++++++++++++++++++++++++++++++++++++++ chat-cli/Cargo.toml | 1 + chat-cli/src/app.rs | 9 +- chat-cli/src/ui.rs | 73 +++++++-- 4 files changed, 422 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3258f85..c1a3e4e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + [[package]] name = "aead" version = "0.5.2" @@ -24,6 +30,32 @@ 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.59.0", + "x11rb", +] + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + [[package]] name = "base64" version = "0.22.1" @@ -60,6 +92,18 @@ dependencies = [ "generic-array 0.14.7", ] +[[package]] +name = "bytemuck" +version = "1.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" + +[[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.1" @@ -126,6 +170,7 @@ name = "chat-cli" version = "0.1.0" dependencies = [ "anyhow", + "arboard", "crossterm 0.29.0", "hex", "libchat", @@ -184,6 +229,15 @@ dependencies = [ "safer-ffi", ] +[[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 = "compact_str" version = "0.8.1" @@ -222,6 +276,15 @@ dependencies = [ "libc", ] +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossterm" version = "0.28.1" @@ -265,6 +328,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "crunchy" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" + [[package]] name = "crypto" version = "0.1.0" @@ -406,6 +475,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "dispatch2" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" +dependencies = [ + "bitflags", + "objc2", +] + [[package]] name = "document-features" version = "0.2.12" @@ -479,6 +558,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 = "ext-trait" version = "1.0.1" @@ -532,6 +617,35 @@ 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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" +dependencies = [ + "simd-adler32", +] + [[package]] name = "fiat-crypto" version = "0.2.9" @@ -544,6 +658,16 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +[[package]] +name = "flate2" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "foldhash" version = "0.1.5" @@ -570,6 +694,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "gethostname" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" +dependencies = [ + "rustix 1.1.3", + "windows-link", +] + [[package]] name = "getrandom" version = "0.2.17" @@ -593,6 +727,17 @@ dependencies = [ "wasip2", ] +[[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.15.5" @@ -655,6 +800,20 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "image" +version = "0.25.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104" +dependencies = [ + "bytemuck", + "byteorder-lite", + "moxcms", + "num-traits", + "png", + "tiff", +] + [[package]] name = "indexmap" version = "2.13.0" @@ -831,6 +990,16 @@ version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + [[package]] name = "mio" version = "1.2.0" @@ -843,6 +1012,98 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "moxcms" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b" +dependencies = [ + "num-traits", + "pxfm", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "objc2" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" +dependencies = [ + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" +dependencies = [ + "bitflags", + "objc2", + "objc2-core-graphics", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" +dependencies = [ + "bitflags", + "dispatch2", + "objc2", +] + +[[package]] +name = "objc2-core-graphics" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" +dependencies = [ + "bitflags", + "dispatch2", + "objc2", + "objc2-core-foundation", + "objc2-io-surface", +] + +[[package]] +name = "objc2-encode" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" + +[[package]] +name = "objc2-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" +dependencies = [ + "bitflags", + "objc2", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-io-surface" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" +dependencies = [ + "bitflags", + "objc2", + "objc2-core-foundation", +] + [[package]] name = "once_cell" version = "1.21.3" @@ -906,6 +1167,12 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + [[package]] name = "pkcs8" version = "0.10.2" @@ -922,6 +1189,19 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +[[package]] +name = "png" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" +dependencies = [ + "bitflags", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + [[package]] name = "poly1305" version = "0.8.0" @@ -993,6 +1273,18 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "pxfm" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5a041e753da8b807c9255f28de81879c78c876392ff2469cde94799b2896b9d" + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quote" version = "1.0.44" @@ -1308,6 +1600,12 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simd-adler32" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" + [[package]] name = "smallvec" version = "1.15.1" @@ -1462,6 +1760,20 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "tiff" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63feaf3343d35b6ca4d50483f94843803b0f51634937cc2ec519fc32232bc52" +dependencies = [ + "fax", + "flate2", + "half", + "quick-error", + "weezl", + "zune-jpeg", +] + [[package]] name = "toml_datetime" version = "0.7.5+spec-1.1.0" @@ -1585,6 +1897,12 @@ dependencies = [ "wit-bindgen", ] +[[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" @@ -1730,6 +2048,23 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "x11rb" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414" +dependencies = [ + "gethostname", + "rustix 1.1.3", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" + [[package]] name = "x25519-dalek" version = "2.0.1" @@ -1803,3 +2138,18 @@ name = "zmij" version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" + +[[package]] +name = "zune-core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9" + +[[package]] +name = "zune-jpeg" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296" +dependencies = [ + "zune-core", +] diff --git a/chat-cli/Cargo.toml b/chat-cli/Cargo.toml index 18f6dcc..b42bcc3 100644 --- a/chat-cli/Cargo.toml +++ b/chat-cli/Cargo.toml @@ -15,3 +15,4 @@ anyhow = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" hex = "0.4" +arboard = "3" diff --git a/chat-cli/src/app.rs b/chat-cli/src/app.rs index a39318e..0f8a484 100644 --- a/chat-cli/src/app.rs +++ b/chat-cli/src/app.rs @@ -5,6 +5,7 @@ use std::fs; use std::path::PathBuf; use anyhow::{Context, Result}; +use arboard::Clipboard; use libchat::{ChatStorage, Context as ChatManager, Introduction, StorageConfig}; use serde::{Deserialize, Serialize}; @@ -364,8 +365,12 @@ impl ChatApp { let bundle = self.create_intro()?; self.add_system_message("── Your Introduction Bundle ──"); self.add_system_message(&bundle); - self.add_system_message("Share this bundle with others to connect!"); - Ok(Some("Bundle created".to_string())) + let clipboard_msg = match Clipboard::new().and_then(|mut cb| cb.set_text(&bundle)) { + Ok(()) => "Bundle copied to clipboard! Paste with Cmd+V in /connect.", + Err(_) => "Share this bundle with others to connect!", + }; + self.add_system_message(clipboard_msg); + Ok(Some("Bundle created and copied to clipboard".to_string())) } "/connect" => { let connect_parts: Vec<&str> = args.splitn(2, ' ').collect(); diff --git a/chat-cli/src/ui.rs b/chat-cli/src/ui.rs index 9ba7dbc..83e9dd3 100644 --- a/chat-cli/src/ui.rs +++ b/chat-cli/src/ui.rs @@ -79,22 +79,63 @@ fn draw_messages(frame: &mut Frame, app: &ChatApp, area: Rect) { .map(|s| s.remote_user.as_str()) .unwrap_or("Them"); + // Inner width: area minus borders (2) for wrapping long content. + let inner_width = area.width.saturating_sub(2) as usize; + let messages: Vec = app .messages() .iter() - .map(|msg| { + .flat_map(|msg| { let (prefix, style) = if msg.from_self { ("You", Style::default().fg(Color::Green)) } else { (remote_name, Style::default().fg(Color::Yellow)) }; - let content = Line::from(vec![ - Span::styled(format!("{}: ", prefix), style.add_modifier(Modifier::BOLD)), - Span::raw(&msg.content), - ]); + let prefix_str = format!("{}: ", prefix); + let prefix_len = prefix_str.len(); - ListItem::new(content) + // Split content into lines that fit within inner_width. + let content = &msg.content; + if content.is_empty() { + return vec![ListItem::new(Line::from(vec![ + Span::styled(prefix_str, style.add_modifier(Modifier::BOLD)), + ]))]; + } + + let mut items = Vec::new(); + let first_line_width = inner_width.saturating_sub(prefix_len).max(1); + + // First line includes the prefix. + let (first_chunk, rest) = if content.len() <= first_line_width { + (content.as_str(), "") + } else { + content.split_at(first_line_width) + }; + + items.push(ListItem::new(Line::from(vec![ + Span::styled(prefix_str, style.add_modifier(Modifier::BOLD)), + Span::raw(first_chunk), + ]))); + + // Continuation lines are indented to align with content. + let indent = " ".repeat(prefix_len); + let mut remaining = rest; + while !remaining.is_empty() { + let chunk_width = inner_width.saturating_sub(prefix_len).max(1); + let (chunk, tail) = if remaining.len() <= chunk_width { + (remaining, "") + } else { + remaining.split_at(chunk_width) + }; + items.push(ListItem::new(Line::from(vec![ + Span::raw(indent.clone()), + Span::raw(chunk), + ]))); + remaining = tail; + } + + items }) .collect(); @@ -110,7 +151,20 @@ fn draw_messages(frame: &mut Frame, app: &ChatApp, area: Rect) { } fn draw_input(frame: &mut Frame, app: &ChatApp, area: Rect) { - let input = Paragraph::new(app.input.as_str()) + // Inner width: area minus borders (2). + let inner_width = area.width.saturating_sub(2) as usize; + let input_len = app.input.len(); + + // Scroll the view so the cursor (end of input) is always visible. + let scroll_offset = if input_len >= inner_width { + input_len - inner_width + 1 + } else { + 0 + }; + + let visible_input = &app.input[scroll_offset..]; + + let input = Paragraph::new(visible_input) .style(Style::default().fg(Color::White)) .block( Block::default() @@ -120,8 +174,9 @@ fn draw_input(frame: &mut Frame, app: &ChatApp, area: Rect) { frame.render_widget(input, area); - // Show cursor - frame.set_cursor_position((area.x + app.input.len() as u16 + 1, area.y + 1)); + // Place cursor at the visible end of the input. + let cursor_x = area.x + (input_len - scroll_offset) as u16 + 1; + frame.set_cursor_position((cursor_x, area.y + 1)); } fn draw_status(frame: &mut Frame, app: &ChatApp, area: Rect) {