feat: fix tui cursor width and add update notice

Author: Rexopia

Cargo.lock

@@ -17,9 +17,11 @@ ratatui = { version = "0.29", features = ["unstable-rendered-line-info"] }
 rmcp = { version = "0.15.0", default-features = false, features = ["macros", "server", "transport-streamable-http-server"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+semver = "1"
 tokio = { version = "1", features = ["macros", "rt-multi-thread", "process", "sync", "time", "io-util", "io-std", "fs", "signal", "net"] }
 tower = { version = "0.5", features = ["util"] }
 tui-textarea = { version = "0.7", features = ["crossterm"] }
+unicode-width = "0.2"
 uuid = { version = "1", features = ["v4"] }
 urlencoding = "2"
 

Cargo.toml

@@ -436,6 +436,8 @@ impl ChatRuntime {
 }
 
 pub async fn run_chat(args: ChatArgs) -> Result<()> {
+    crate::update::maybe_print_update_notice().await;
+
     let cwd = std::env::current_dir().context("failed to resolve current dir")?;
     let config_path = cwd.join(Path::new(&args.config_path));
     let is_tty = std::io::stdin().is_terminal();

src/chat.rs

@@ -16,6 +16,8 @@ pub struct InitArgs {
 }
 
 pub async fn run_init(args: InitArgs) -> Result<()> {
+    crate::update::maybe_print_update_notice().await;
+
     let profiles_path = profiles::global_profiles_path()?;
 
     if let Some(name) = args.delete {

src/init.rs

@@ -11,6 +11,7 @@ mod provider;
 mod scheduler;
 mod text;
 mod tui;
+mod update;
 
 use clap::{Args, Parser, Subcommand};
 

src/main.rs

@@ -28,6 +28,7 @@ use tokio::sync::mpsc::UnboundedReceiver;
 use tokio::sync::mpsc::error::TryRecvError;
 use tokio::task::JoinHandle;
 use tui_textarea::TextArea;
+use unicode_width::UnicodeWidthStr;
 
 use crate::chat::{ChatRuntime, handle_user_input};
 use crate::kernel::MessageEvent;
@@ -609,23 +610,38 @@ fn cursor_visual_position(textarea: &TextArea, content_width: u16) -> (usize, us
     let mut visual_row = 0_usize;
 
     for line in lines.iter().take(cursor_row) {
-        let line_len = line.chars().count();
-        let wrapped_rows = if line_len == 0 {
+        let display_width = UnicodeWidthStr::width(line.as_str());
+        let wrapped_rows = if display_width == 0 {
             1
         } else {
-            line_len.saturating_sub(1) / width + 1
+            display_width.saturating_sub(1) / width + 1
         };
         visual_row = visual_row.saturating_add(wrapped_rows);
     }
 
-    let current_line_len = lines[cursor_row].chars().count();
+    let current_line = lines[cursor_row].as_str();
+    let current_line_len = current_line.chars().count();
     let cursor_col = cursor_col.min(current_line_len);
-    visual_row = visual_row.saturating_add(cursor_col / width);
-    let visual_col = cursor_col % width;
+    let cursor_display_col = display_width_for_char_prefix(current_line, cursor_col);
+    visual_row = visual_row.saturating_add(cursor_display_col / width);
+    let visual_col = cursor_display_col % width;
 
     (visual_row, visual_col)
 }
 
+fn display_width_for_char_prefix(line: &str, char_count: usize) -> usize {
+    if char_count == 0 {
+        return 0;
+    }
+
+    let split_at = line
+        .char_indices()
+        .nth(char_count)
+        .map(|(byte_idx, _)| byte_idx)
+        .unwrap_or(line.len());
+    UnicodeWidthStr::width(&line[..split_at])
+}
+
 fn input_rendered_line_count(textarea: &TextArea, content_width: u16) -> usize {
     Paragraph::new(input_text(textarea))
         .wrap(Wrap { trim: false })
@@ -973,4 +989,22 @@ mod tests {
         let (row, col) = cursor_visual_position(&textarea, 5);
         assert_eq!((row, col), (1, 1));
     }
+
+    #[test]
+    fn cursor_visual_position_accounts_for_wide_char_width() {
+        let mut textarea = TextArea::default();
+        textarea.insert_str("你好a");
+
+        let (row, col) = cursor_visual_position(&textarea, 4);
+        assert_eq!((row, col), (1, 1));
+    }
+
+    #[test]
+    fn cursor_visual_position_counts_wrapped_wide_lines_before_cursor_row() {
+        let mut textarea = TextArea::default();
+        textarea.insert_str("你好你好\nx");
+
+        let (row, col) = cursor_visual_position(&textarea, 4);
+        assert_eq!((row, col), (2, 1));
+    }
 }

src/tui.rs

@@ -0,0 +1,105 @@
+use std::io::IsTerminal;
+use std::process::Stdio;
+
+use semver::Version;
+use tokio::process::Command;
+use tokio::time::{Duration, timeout};
+
+const CREWFORGE_PACKAGE_NAME: &str = "crewforge";
+const DEFAULT_NPM_COMMAND: &str = "npm";
+const UPDATE_CHECK_TIMEOUT_MS: u64 = 1_200;
+const DISABLE_UPDATE_CHECK_ENV: &str = "CREWFORGE_NO_UPDATE_CHECK";
+
+pub async fn maybe_print_update_notice() {
+    if !std::io::stdout().is_terminal() || update_check_disabled() {
+        return;
+    }
+
+    let Some(latest) = latest_npm_version().await else {
+        return;
+    };
+    let current = env!("CARGO_PKG_VERSION");
+    if !is_newer_version(current, &latest) {
+        return;
+    }
+
+    eprintln!(
+        "[update] New crewforge version {latest} is available (current {current}). Run `npm i -g crewforge` to update."
+    );
+}
+
+async fn latest_npm_version() -> Option<String> {
+    let command = std::env::var("CREWFORGE_NPM_COMMAND")
+        .ok()
+        .filter(|value| !value.trim().is_empty())
+        .unwrap_or_else(|| DEFAULT_NPM_COMMAND.to_string());
+
+    let output = timeout(
+        Duration::from_millis(UPDATE_CHECK_TIMEOUT_MS),
+        Command::new(command)
+            .arg("view")
+            .arg(CREWFORGE_PACKAGE_NAME)
+            .arg("version")
+            .arg("--silent")
+            .stdin(Stdio::null())
+            .stdout(Stdio::piped())
+            .stderr(Stdio::null())
+            .output(),
+    )
+    .await
+    .ok()?
+    .ok()?;
+
+    if !output.status.success() {
+        return None;
+    }
+
+    first_non_empty_line(&String::from_utf8_lossy(&output.stdout)).map(str::to_string)
+}
+
+fn first_non_empty_line(text: &str) -> Option<&str> {
+    text.lines().find_map(|line| {
+        let line = line.trim();
+        if line.is_empty() { None } else { Some(line) }
+    })
+}
+
+fn update_check_disabled() -> bool {
+    let Some(value) = std::env::var(DISABLE_UPDATE_CHECK_ENV).ok() else {
+        return false;
+    };
+    matches!(
+        value.trim().to_ascii_lowercase().as_str(),
+        "1" | "true" | "yes"
+    )
+}
+
+fn is_newer_version(current: &str, latest: &str) -> bool {
+    let Some(current) = Version::parse(current).ok() else {
+        return false;
+    };
+    let Some(latest) = Version::parse(latest).ok() else {
+        return false;
+    };
+    latest > current
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn first_non_empty_line_skips_blanks() {
+        assert_eq!(first_non_empty_line("\n  \n0.2.0\n"), Some("0.2.0"));
+    }
+
+    #[test]
+    fn newer_semver_detected_correctly() {
+        assert!(is_newer_version("0.1.3", "0.1.4"));
+        assert!(is_newer_version("0.1.3", "0.2.0"));
+        assert!(!is_newer_version("0.1.3", "0.1.3"));
+        assert!(!is_newer_version("0.2.0", "0.1.9"));
+        assert!(!is_newer_version("dev", "0.1.4"));
+        assert!(!is_newer_version("0.1.3", "latest"));
+    }
+}