@@ -4,6 +4,7 @@ version = "20.0.4"
 edition = "2021"
 
 [dependencies]
+unicode-width = "0.2.2"
 
 [dev-dependencies]
 insta = "1.47.2"
@@ -1,14 +1,14 @@
 ---
 source: crates/ccusage-terminal/src/table.rs
-assertion_line: 494
+assertion_line: 495
 expression: "table.render_lines().join(\"\\n\")"
 ---
-┌────────────┬────────────┬──────────┬──────────┬──────────┐
-│ Date       │ Models     │    Input │   Output │     Cost │
-│            │            │          │          │    (USD) │
-├────────────┼────────────┼──────────┼──────────┼──────────┤
-│ 2026-05-18 │ -          │ 123,456… │ 9,876,5… │ $12345.… │
-│            │ claude-so… │          │          │          │
-│            │ -          │          │          │          │
-│            │ unusually… │          │          │          │
-└────────────┴────────────┴──────────┴──────────┴──────────┘
+┌──────────┬────────────┬──────────┬──────────┬──────────┐
+│ Date     │ Models     │    Input │   Output │     Cost │
+│          │            │          │          │    (USD) │
+├──────────┼────────────┼──────────┼──────────┼──────────┤
+│ 2026     │ -          │ 123,456… │ 9,876,5… │ $12345.… │
+│ 05-18    │ claude-so… │          │          │          │
+│          │ -          │          │          │          │
+│          │ unusually… │          │          │          │
+└──────────┴────────────┴──────────┴──────────┴──────────┘
@@ -139,15 +139,14 @@ impl SimpleTable {
             })
             .collect::<Vec<_>>();
         let total_required = cli_table_required_width(&widths);
-        let first_column_min = if self.compact_dates { 12 } else { 10 };
-        let mut widths =
-            fit_widths_to_terminal(widths, &self.aligns, self.terminal_width, first_column_min);
-        if self.compact_dates && total_required > self.terminal_width {
-            if let Some(width) = widths.first_mut() {
-                *width = (*width).max(10);
-            }
-        }
-        widths
+        let first_column_min = if self.compact_dates && total_required > self.terminal_width {
+            10
+        } else if self.compact_dates {
+            12
+        } else {
+            10
+        };
+        fit_widths_to_terminal(widths, &self.aligns, self.terminal_width, first_column_min)
     }
 
     fn compact_date_row(&self, row: &[String], widths: &[usize]) -> Vec<String> {
 
@@ -1,3 +1,5 @@
+use unicode_width::UnicodeWidthChar;
+
 pub(crate) fn visible_width(value: &str) -> usize {
     let bytes = value.as_bytes();
     let mut width = 0;
@@ -28,11 +30,7 @@ pub(crate) fn contains_ansi(value: &str) -> bool {
 }
 
 pub(crate) fn char_display_width(ch: char) -> usize {
-    if ch.is_ascii() {
-        1
-    } else {
-        2
-    }
+    UnicodeWidthChar::width_cjk(ch).unwrap_or(0)
 }
 
 pub(crate) fn visible_width_max_line(value: &str) -> usize {
@@ -42,3 +40,14 @@ pub(crate) fn visible_width_max_line(value: &str) -> usize {
 pub(crate) fn visible_width_sum(value: &str) -> usize {
     value.lines().map(visible_width).sum()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn visible_width_handles_combining_marks_and_cjk() {
+        assert_eq!(visible_width("e\u{0301}"), 1);
+        assert_eq!(visible_width("表"), 2);
+    }
+}