@ramarivera/coding-buddy 0.8.0 → 0.9.0

package/statusline/buddy-status.sh

@@ -12,6 +12,27 @@
 #
 # When running inside buddy-shell (the PTY wrapper), skip status line rendering
 # so the buddy doesn't show up twice (once in status line, once in wrapper panel).
+# Bash treats COLUMNS as a special variable and may refresh it from a
+# controlling PTY after startup. Snapshot the exported value before any
+# sourced helper or external command can trigger that refresh.
+_INHERITED_COLUMNS="${COLUMNS:-}"
+# Width math and substring slicing must agree on UTF-8 codepoints. Claude Code
+# emits Unicode art even when a caller inherited the POSIX C locale.
+_LOCALE_HINT="${LC_ALL:-${LC_CTYPE:-${LANG:-}}}"
+case "$_LOCALE_HINT" in
+    *UTF-8|*utf-8|*utf8|*UTF8) ;;
+    *)
+        _UTF8_LOCALE=""
+        for _candidate in C.UTF-8 en_US.UTF-8; do
+            if locale -a 2>/dev/null | grep -Fx "$_candidate" >/dev/null 2>&1; then
+                _UTF8_LOCALE="$_candidate"
+                break
+            fi
+        done
+        [ -n "$_UTF8_LOCALE" ] && export LC_ALL="$_UTF8_LOCALE"
+        ;;
+esac
+
 [ "$BUDDY_SHELL" = "1" ] && exit 0
 
 # shellcheck source=../scripts/paths.sh
@@ -35,7 +56,6 @@ RARITY=$(jq -r '.rarity // "common"' "$STATE" 2>/dev/null)
 STARS=$(jq -r '.stars // ""' "$STATE" 2>/dev/null)
 SHINY=$(jq -r '.shiny // false' "$STATE" 2>/dev/null)
 REACTION_FILE="$BUDDY_STATE_DIR/reaction.$SID.json"
-REACTION=$(jq -r '.reaction // ""' "$REACTION_FILE" 2>/dev/null)
 ACHIEVEMENT=$(jq -r '.achievement // ""' "$STATE" 2>/dev/null)
 LEVEL=$(jq -r '.level // 1' "$STATE" 2>/dev/null)
 MOOD=$(jq -r '.mood // "focused"' "$STATE" 2>/dev/null)
@@ -113,57 +133,132 @@ if [ -f "$CONFIG_FILE" ]; then
     fi
 fi
 
+COLOR_ENABLED=1
+[ -n "${NO_COLOR:-}" ] && COLOR_ENABLED=0
+
 RAINBOW_LEN=${#RAINBOW[@]}
 RAINBOW_OFFSET=$(( NOW % RAINBOW_LEN ))
 
+_is_positive_cols() {
+    case "$1" in
+        ''|*[!0-9]*) return 1 ;;
+    esac
+    [ "$1" -gt 0 ] 2>/dev/null && return 0
+    return 1
+}
+
 # ─── Terminal width ──────────────────────────────────────────────────────────
 COLS=0
-PID=$$
-for _ in 1 2 3 4 5; do
-    PID=$(ps -o ppid= -p "$PID" 2>/dev/null | tr -d ' ')
-    [ -z "$PID" ] || [ "$PID" = "1" ] && break
-
-    # Linux: read PTY device from /proc
-    PTY=$(readlink "/proc/${PID}/fd/0" 2>/dev/null)
-    if [ -c "$PTY" ] 2>/dev/null; then
-        COLS=$(stty size < "$PTY" 2>/dev/null | awk '{print $2}')
-        [ "${COLS:-0}" -gt 40 ] 2>/dev/null && break
-    fi
 
-    # macOS: /proc doesn't exist — get TTY name from process table
-    TTY_NAME=$(ps -o tty= -p "$PID" 2>/dev/null | tr -d ' ')
-    if [ -n "$TTY_NAME" ] && [ "$TTY_NAME" != "??" ] && [ "$TTY_NAME" != "?" ]; then
-        TTY_DEV="/dev/$TTY_NAME"
-        if [ -c "$TTY_DEV" ] 2>/dev/null; then
-            COLS=$(stty size < "$TTY_DEV" 2>/dev/null | awk '{print $2}')
-            [ "${COLS:-0}" -gt 40 ] 2>/dev/null && break
+# Claude Code renders this command inside a content box, not across the full
+# terminal. Reserve two columns for settings.json padding (1 per side) and
+# twelve for Claude Code's internal left/right content margins. The 14-column
+# reserve is calibrated against the reported ~74-column content box; the
+# regression fixture is rendered at 60, 80, and 120 columns to assert the
+# resulting budget before output.
+CHROME_RESERVE=14
+STATUSLINE_WIDTH_ADJUST=0
+
+# Width resolution precedence (real use):
+#   1. BUDDY_STATUSLINE_COLS (validated positive integer)
+#   2. exported COLUMNS (validated positive integer)
+#   3. Linux: /proc/$PID/fd/0 PTY via stty size
+#   4. macOS: ps + stty on /dev/$TTY_NAME
+#   5. Windows: PowerShell (Get-Host).UI.RawUI.WindowSize.Width
+#   6. final default 125
+if _is_positive_cols "${BUDDY_STATUSLINE_COLS:-}"; then
+    COLS=$((10#${BUDDY_STATUSLINE_COLS}))
+elif _is_positive_cols "$_INHERITED_COLUMNS"; then
+    COLS=$((10#$_INHERITED_COLUMNS))
+else
+    PID=$$
+    for _ in 1 2 3 4 5; do
+        PID=$(ps -o ppid= -p "$PID" 2>/dev/null | tr -d ' ')
+        [ -z "$PID" ] || [ "$PID" = "1" ] && break
+
+        # Linux: read PTY device from /proc
+        PTY=$(readlink "/proc/${PID}/fd/0" 2>/dev/null)
+        if [ -c "$PTY" ] 2>/dev/null; then
+            COLS=$(stty size < "$PTY" 2>/dev/null | awk '{print $2}')
+            _is_positive_cols "${COLS:-}" && break
+        fi
+
+        # macOS: /proc doesn't exist — get TTY name from process table
+        TTY_NAME=$(ps -o tty= -p "$PID" 2>/dev/null | tr -d ' ')
+        if [ -n "$TTY_NAME" ] && [ "$TTY_NAME" != "??" ] && [ "$TTY_NAME" != "?" ]; then
+            TTY_DEV="/dev/$TTY_NAME"
+            if [ -c "$TTY_DEV" ] 2>/dev/null; then
+                COLS=$(stty size < "$TTY_DEV" 2>/dev/null | awk '{print $2}')
+                _is_positive_cols "${COLS:-}" && break
+            fi
+        fi
+    done
+
+    [ "${COLS:-0}" -lt 1 ] 2>/dev/null && COLS=0
+    # Windows: /proc and TTY device detection don't exist; use PowerShell as fallback
+    if [ "${COLS:-0}" -lt 1 ] 2>/dev/null; then
+        _ps_cols=$(powershell.exe -NoProfile -Command "(Get-Host).UI.RawUI.WindowSize.Width" 2>/dev/null | tr -d '\r\n')
+        if _is_positive_cols "$_ps_cols"; then
+            [ "$_ps_cols" -gt 40 ] 2>/dev/null && COLS=$((10#$_ps_cols))
         fi
     fi
-done
-[ "${COLS:-0}" -lt 40 ] 2>/dev/null && COLS=${COLUMNS:-0}
-# Windows: /proc and TTY device detection don't exist; use PowerShell as fallback
-if [ "${COLS:-0}" -lt 40 ] 2>/dev/null; then
-    _ps_cols=$(powershell.exe -NoProfile -Command "(Get-Host).UI.RawUI.WindowSize.Width" 2>/dev/null | tr -d '\r\n')
-    case "$_ps_cols" in ''|*[!0-9]*) ;; *) [ "$_ps_cols" -gt 40 ] 2>/dev/null && COLS=$_ps_cols ;; esac
+    [ "${COLS:-0}" -lt 1 ] 2>/dev/null && COLS=125
 fi
-[ "${COLS:-0}" -lt 40 ] 2>/dev/null && COLS=125
+COLS=$((10#$COLS))
+DETECTED_COLS="$COLS"
 
 # ─── Reaction bubble (with TTL check) ────────────────────────────────────────
 BUBBLE=""
 if [ -n "$ACHIEVEMENT" ] && [ "$ACHIEVEMENT" != "null" ] && [ "$ACHIEVEMENT" != "" ]; then
     BUBBLE=$'\xf0\x9f\x8f\x86'" $ACHIEVEMENT"
 fi
-REACTION_TTL=0
+REACTION_TTL=900
 INNER_W=44
 MARGIN=8
 if [ -f "$CONFIG_FILE" ]; then
-    _ttl=$(jq -r '.reactionTTL // 0' "$CONFIG_FILE" 2>/dev/null || echo 0)
+    _ttl=$(jq -r '.reactionTTL // 900' "$CONFIG_FILE" 2>/dev/null || echo 900)
     case "$_ttl" in ''|*[!0-9]*) ;; *) REACTION_TTL="$_ttl" ;; esac
     _bw=$(jq -r '.bubbleWidth // 44' "$CONFIG_FILE" 2>/dev/null || echo 44)
     case "$_bw" in ''|*[!0-9]*) ;; *) INNER_W="$_bw" ;; esac
     _bm=$(jq -r '.bubbleMargin // 8' "$CONFIG_FILE" 2>/dev/null || echo 8)
     case "$_bm" in ''|*[!0-9]*) ;; *) MARGIN="$_bm" ;; esac
+    _wa=$(jq -r '.statuslineWidthAdjust // 0' "$CONFIG_FILE" 2>/dev/null || echo 0)
+    if printf '%s' "$_wa" | grep -Eq '^[+-]?[0-9]+$'; then
+        case "$_wa" in
+            +*) STATUSLINE_WIDTH_ADJUST=$((10#${_wa#+})) ;;
+            -*) STATUSLINE_WIDTH_ADJUST=$((-10#${_wa#-})) ;;
+            *)  STATUSLINE_WIDTH_ADJUST=$((10#$_wa)) ;;
+        esac
+    fi
 fi
+_sweep_expired_reactions() {
+    [ "$REACTION_TTL" -gt 0 ] 2>/dev/null || return 0
+    local now cutoff_ms cutoff_seconds file ts
+    now=$(date +%s)
+    cutoff_ms=$(( (now - REACTION_TTL) * 1000 ))
+    cutoff_seconds=$(( now - REACTION_TTL ))
+
+    for file in "$BUDDY_STATE_DIR"/reaction.*.json; do
+        [ -f "$file" ] || continue
+        ts=$(jq -r '.timestamp // 0' "$file" 2>/dev/null || echo 0)
+        case "$ts" in
+            ''|*[!0-9]*) rm -f "$file" 2>/dev/null ;;
+            *) [ "$ts" -le "$cutoff_ms" ] 2>/dev/null && rm -f "$file" 2>/dev/null ;;
+        esac
+    done
+
+    for file in "$BUDDY_STATE_DIR"/.last_comment.*; do
+        [ -f "$file" ] || continue
+        ts=$(cat "$file" 2>/dev/null)
+        case "$ts" in
+            ''|*[!0-9]*) rm -f "$file" 2>/dev/null ;;
+            *) [ "$ts" -le "$cutoff_seconds" ] 2>/dev/null && rm -f "$file" 2>/dev/null ;;
+        esac
+    done
+}
+
+_sweep_expired_reactions
+REACTION=$(jq -r '.reaction // ""' "$REACTION_FILE" 2>/dev/null)
 if [ -n "$REACTION" ] && [ "$REACTION" != "null" ] && [ "$REACTION" != "" ]; then
     FRESH=0
     if [ "$REACTION_TTL" -eq 0 ]; then
@@ -172,7 +267,7 @@ if [ -n "$REACTION" ] && [ "$REACTION" != "null" ] && [ "$REACTION" != "" ]; the
         TS=$(jq -r '.timestamp // 0' "$REACTION_FILE" 2>/dev/null || echo 0)
         if [ "$TS" != "0" ]; then
             NOW=$(date +%s)
-            AGE=$(( NOW - TS / 1000 ))
+            AGE=$(( (NOW * 1000 - TS) / 1000 ))
             [ "$AGE" -lt "$REACTION_TTL" ] && FRESH=1
         fi
     fi
@@ -182,6 +277,8 @@ if [ -n "$REACTION" ] && [ "$REACTION" != "null" ] && [ "$REACTION" != "" ]; the
         else
             BUBBLE="\"${REACTION}\""
         fi
+    else
+        rm -f "$REACTION_FILE" 2>/dev/null
     fi
 fi
 
@@ -209,6 +306,15 @@ NAME_PAD=$(( ART_CENTER - NAME_LEN / 2 ))
 NAME_LINE="$(printf '%*s%s' "$NAME_PAD" '' "$NAME_WITH_LEVEL")"
 
 DIM=$'\033[2;3m'
+if [ "$COLOR_ENABLED" -eq 0 ]; then
+    C=""
+    NC=""
+    NEUTRAL=""
+    DIM=""
+    for _rainbow_index in "${!RAINBOW[@]}"; do
+        RAINBOW[$_rainbow_index]=""
+    done
+fi
 
 ALL_LINES=()
 ALL_COLORS=()
@@ -218,19 +324,12 @@ for line in "${ART_LINES[@]}"; do
     if [ "$SHINY" = "true" ]; then
         ALL_COLORS+=("${RAINBOW[$(( (_arc + RAINBOW_OFFSET) % RAINBOW_LEN ))]}")
     else
-        ALL_COLORS+=("$NEUTRAL")
+        ALL_COLORS+=("$C")
     fi
     _arc=$(( _arc + 1 ))
 done
 ALL_LINES+=("$NAME_LINE"); ALL_COLORS+=("$C")
 
-case "$SPECIES" in
-  axolotl|capybara|rabbit|mushroom|chonk) ART_W=10 ;;
-  duck|blob|cat|dragon|robot|wyvern)      ART_W=9  ;;
-  octopus|owl|turtle|snail|ghost|cactus)  ART_W=8  ;;
-  goose|penguin)                          ART_W=7  ;;
-  *)                                      ART_W=10 ;;
-esac
 ART_COUNT=${#ALL_LINES[@]}
 
 # ─── Speech bubble (left of art, word-wrapped) ──────────────────────────────
@@ -243,25 +342,33 @@ fi
 
 # ─── Display width (emojis count as 2 cols) ──────────────────────────────────
 # iconv turns the string into a stream of UTF-32LE codepoints, then awk sums
-# widths. Rules mirror server/art.ts:displayWidth — the U+2600-U+27BF range
-# is split by Emoji_Presentation (2) vs text-presentation (1), and VS16
-# (U+FE0F) upgrades the previous narrow symbol to 2 cols (e.g. ❤ + VS16).
-# The ambiguous codepoint list comes from emoji-widths.data, generated by
-# scripts/gen-emoji-widths.ts from the Unicode Emoji_Presentation property.
+# widths. Rules mirror server/art.ts:displayWidth; the generated data lists
+# every Unicode Emoji_Presentation codepoint, while VS16 upgrades a previous
+# narrow emoji to 2 cols (e.g. ❤ + VS16).
 EMOJI_WIDTHS_DATA="$(dirname "${BASH_SOURCE[0]}")/emoji-widths.data"
 EMOJI_PRES_2600="$(grep -v '^#' "$EMOJI_WIDTHS_DATA" 2>/dev/null | tr -d '\n')"
+EMOJI_TEXT_DATA="$(dirname "${BASH_SOURCE[0]}")/emoji-text.data"
+EMOJI_TEXT="$(grep -v '^#' "$EMOJI_TEXT_DATA" 2>/dev/null | tr -d '\n')"
 
 dwidth() {
-    printf '%s' "$1" | iconv -f UTF-8 -t UTF-32LE 2>/dev/null | od -An -tu4 | awk -v pres="$EMOJI_PRES_2600" '
+    printf '%s' "$1" | iconv -f UTF-8 -t UTF-32LE 2>/dev/null | od -An -tu4 | awk -v pres="$EMOJI_PRES_2600" -v text="$EMOJI_TEXT" '
+    function load_ranges(value, target,    n, i, count, piece, bounds, start, end, cp) {
+        n = split(value, ranges, ",")
+        for (i = 1; i <= n; i++) {
+            count = split(ranges[i], bounds, "-")
+            start = bounds[1] + 0
+            end = (count == 2) ? bounds[2] + 0 : start
+            for (cp = start; cp <= end; cp++) target[cp] = 1
+        }
+    }
     BEGIN {
-        n = split(pres, arr)
-        for (k = 1; k <= n; k++) wide[arr[k]] = 1
+        load_ranges(pres, wide)
+        load_ranges(text, text_default)
     }
     # Precondition: cp is neither a variation selector (65024-65039) nor ZWJ
     # (8205); the main loop filters those before calling in.
     function char_width(cp) {
-        if (cp >= 126976) return 2
-        if (cp >= 9728 && cp <= 10175) return (cp in wide) ? 2 : 1
+        if (cp in wide) return 2
         if (cp >= 9472 && cp <= 9631) return 1
         if (cp >= 12288 && cp <= 40959) return 2
         if (cp >= 65281 && cp <= 65376) return 2
@@ -276,15 +383,117 @@ dwidth() {
         if ((cp >= 65024 && cp <= 65038) || cp == 8205) { upgradable = 0; continue }
         cw = char_width(cp)
         w += cw
-        upgradable = (cw == 1 && cp >= 9728 && cp <= 10175) ? 1 : 0
+        upgradable = 0
+        if (cw == 1 && (cp in text_default)) upgradable = 1
     } }
     END { print w+0 }'
 }
+# Emit one display-width value per UTF-8 codepoint. ANSI-aware truncation uses
+# this profile to make one Unicode-width pass over the complete output row.
+dwidth_profile() {
+    printf '%s' "$1" | iconv -f UTF-8 -t UTF-32LE 2>/dev/null | od -An -tu4 | awk -v pres="$EMOJI_PRES_2600" -v text="$EMOJI_TEXT" '
+    function load_ranges(value, target,    n, i, count, piece, bounds, start, end, cp) {
+        n = split(value, ranges, ",")
+        for (i = 1; i <= n; i++) {
+            count = split(ranges[i], bounds, "-")
+            start = bounds[1] + 0
+            end = (count == 2) ? bounds[2] + 0 : start
+            for (cp = start; cp <= end; cp++) target[cp] = 1
+        }
+    }
+    BEGIN {
+        load_ranges(pres, wide)
+        load_ranges(text, text_default)
+    }
+    function char_width(cp) {
+        if (cp in wide) return 2
+        if (cp >= 9472 && cp <= 9631) return 1
+        if (cp >= 12288 && cp <= 40959) return 2
+        if (cp >= 65281 && cp <= 65376) return 2
+        return 1
+    }
+    {
+        for (j = 1; j <= NF; j++) {
+            cp = $j + 0
+            idx++
+            if (cp == 65039) {
+                if (upgradable && idx > 1) widths[idx - 1] += 1
+                widths[idx] = 0
+                upgradable = 0
+                continue
+            }
+            if ((cp >= 65024 && cp <= 65038) || cp == 8205) {
+                widths[idx] = 0
+                upgradable = 0
+                continue
+            }
+            cw = char_width(cp)
+            widths[idx] = cw
+            upgradable = 0
+            if (cw == 1 && (cp in text_default)) upgradable = 1
+        }
+    }
+    END {
+        for (j = 1; j <= idx; j++) print widths[j] + 0
+    }'
+}
+ART_W=0
+for line in "${ART_LINES[@]}"; do
+    line_w=$(dwidth "$line")
+    [ "$line_w" -gt "$ART_W" ] && ART_W="$line_w"
+done
+
+# Keep the label inside the same sprite column as the art. The exact Unicode
+# width rules live in dwidth(), so the shell and TS renderers agree on bounds.
+LABEL_W=$(dwidth "$NAME_WITH_LEVEL")
+if [ "$LABEL_W" -gt "$ART_W" ] 2>/dev/null; then
+    ART_W="$LABEL_W"
+    NAME_PAD=$(( (ART_W - LABEL_W) / 2 ))
+    NAME_LINE="$(printf '%*s%s' "$NAME_PAD" '' "$NAME_WITH_LEVEL")"
+    ALL_LINES[$(( ART_COUNT - 1 ))]="$NAME_LINE"
+fi
+NAME_LINE_W=$(dwidth "$NAME_LINE")
+# Centering the name against a short fixture frame can make the label wider
+# than every art row; include that width before sizing the card.
+[ "$NAME_LINE_W" -gt "$ART_W" ] && ART_W="$NAME_LINE_W"
+
+STATUSLINE_BUDGET=$(( DETECTED_COLS - CHROME_RESERVE + STATUSLINE_WIDTH_ADJUST ))
+# Preserve the existing compact-card behavior at the smallest supported
+# terminal size; the reserve applies once there is enough room for chrome.
+if [ "$DETECTED_COLS" -ge 40 ] 2>/dev/null && [ "$STATUSLINE_BUDGET" -lt 40 ]; then
+    STATUSLINE_BUDGET=40
+fi
+[ "$STATUSLINE_BUDGET" -gt "$DETECTED_COLS" ] && STATUSLINE_BUDGET="$DETECTED_COLS"
+
+# The sprite and its identifying name are the irreducible minimum of the card.
+# Never let the chrome reserve push the usable budget below the sprite's own
+# width; if it does, fall back to the raw terminal width. If the terminal
+# itself is narrower than the sprite, use the historical default rather than
+# slicing art or name.
+if [ "$STATUSLINE_BUDGET" -lt "$ART_W" ]; then
+    STATUSLINE_BUDGET="$DETECTED_COLS"
+fi
+if [ "$STATUSLINE_BUDGET" -lt "$ART_W" ]; then
+    STATUSLINE_BUDGET=125
+fi
+COLS="$STATUSLINE_BUDGET"
+
+# The bubble, tail, and sprite are one unit. At narrow widths, drop the
+# bubble rather than allowing a partial border or tail to escape the panel.
+MIN_BUBBLE_INNER=12
+TAIL_W=3
+MAX_INNER=$(( COLS - ART_W - TAIL_W - 4 - MARGIN ))
+if [ -n "$BUBBLE" ] && [ "$MAX_INNER" -ge "$MIN_BUBBLE_INNER" ] 2>/dev/null; then
+    [ "$INNER_W" -gt "$MAX_INNER" ] && INNER_W="$MAX_INNER"
+else
+    BUBBLE=""
+    BUBBLE_TEXT=""
+fi
 
 # ─── Word-wrap bubble text ────────────────────────────────────────────────────
 TEXT_LINES=()
 if [ -n "$BUBBLE_TEXT" ]; then
-    WORDS=($BUBBLE_TEXT)
+    read -r -a WORDS <<< "$BUBBLE_TEXT"
     CUR_LINE=""
     CUR_W=0
     for word in "${WORDS[@]}"; do
@@ -329,13 +538,16 @@ fi
 BUBBLE_COUNT=${#BUBBLE_LINES[@]}
 
 # ─── Right-align with bubble box to the left ─────────────────────────────────
-GAP=2
+GAP=3
 if [ $BUBBLE_COUNT -gt 0 ]; then
     TOTAL_W=$(( BOX_W + GAP + ART_W ))
 else
     TOTAL_W=$ART_W
 fi
-PAD=$(( COLS - TOTAL_W - MARGIN ))
+# COLS already includes the Claude Code chrome reserve. The spacer starts with
+# one Braille Blank cell, so account for that cell but don't subtract MARGIN
+# again; doing so leaves the card visibly short of the pane's right edge.
+PAD=$(( COLS - TOTAL_W - 1 ))
 [ "$PAD" -lt 0 ] && PAD=0
 
 # On Windows (Git Bash / MSYS2), Braille Blank (U+2800) renders as double-width,
@@ -344,7 +556,6 @@ case "$(uname -s)" in
     MINGW*|CYGWIN*|MSYS*) SPACER=$(printf '%*s' "$PAD" '') ;;
     *)                     SPACER=$(printf "${B}%${PAD}s" "") ;;
 esac
-GAP_STR=$(printf '%*s' "$GAP" '')
 
 # Vertically center bubble box on the art
 BUBBLE_START=0
@@ -362,9 +573,10 @@ if [ $BUBBLE_COUNT -gt 2 ]; then
     CONNECTOR_BI=$(( (FIRST_TEXT + LAST_TEXT) / 2 ))
 fi
 
-# ─── Output: merged bubble box + connector + art per line ─────────────────────
+# ─── Output: merged bubble box + art per line ──────────────────────────────────
 TOTAL_BUBBLE=$(( BUBBLE_START + BUBBLE_COUNT ))
 MAX_LINES=$(( ART_COUNT > TOTAL_BUBBLE ? ART_COUNT : TOTAL_BUBBLE ))
+OUTPUT_LINES=()
 for (( i=0; i<MAX_LINES; i++ )); do
     # Art part: actual art line or blank filler
     if [ $i -lt $ART_COUNT ]; then
@@ -379,30 +591,110 @@ for (( i=0; i<MAX_LINES; i++ )); do
             bline="${BUBBLE_LINES[$bi]}"
             btype="${BUBBLE_TYPES[$bi]}"
 
-            # Connector: "-- " on the middle text line, spaces otherwise
+            # Connector: "-- " on the middle text line, spaces otherwise.
             if [ $bi -eq $CONNECTOR_BI ]; then
-                gap="${NEUTRAL}--${NC} "
+                gap="${C}--${NC} "
             else
                 gap="   "
             fi
 
             if [ "$btype" = "border" ]; then
-                echo "${SPACER}${NEUTRAL}${bline}${NC}${gap}${art_part}"
+                OUTPUT_LINES+=("${SPACER}${C}${bline}${NC}${gap}${art_part}")
             else
                 pipe_l="${bline:0:1}"
                 pipe_r="${bline: -1}"
                 inner="${bline:1:$(( ${#bline} - 2 ))}"
-                echo "${SPACER}${NEUTRAL}${pipe_l}${NC}${DIM}${inner}${NC}${NEUTRAL}${pipe_r}${NC}${gap}${art_part}"
+                OUTPUT_LINES+=("${SPACER}${C}${pipe_l}${NC}${DIM}${inner}${NC}${C}${pipe_r}${NC}${gap}${art_part}")
             fi
         else
             empty=$(printf '%*s' "$BOX_W" '')
-            echo "${SPACER}${empty}   ${art_part}"
+            OUTPUT_LINES+=("${SPACER}${empty}   ${art_part}")
         fi
     else
-        echo "${SPACER}${art_part}"
+        OUTPUT_LINES+=("${SPACER}${art_part}")
     fi
 done
 
+ansi_truncate() {
+    local text="$1"
+    local max_width="$2"
+    local out=""
+    local plain=""
+    local i=0
+    local text_len=${#text}
+    local char seq char_width truncated=0 saw_sgr=0
+    local visible_width=0
+    local -a widths
+    local visible_index=0
+
+    [ "$max_width" -lt 0 ] && max_width=0
+
+    # Strip SGR while building the one string sent to dwidth_profile. The
+    # profile uses one iconv/od/awk pass for the whole row; never spawn a
+    # subprocess for each Unicode character.
+    while [ "$i" -lt "$text_len" ]; do
+        char="${text:$i:1}"
+        if [ "$char" = $'\033' ]; then
+            saw_sgr=1
+            i=$(( i + 1 ))
+            while [ "$i" -lt "$text_len" ]; do
+                char="${text:$i:1}"
+                i=$(( i + 1 ))
+                [ "$char" = "m" ] && break
+            done
+            continue
+        fi
+        plain="${plain}${char}"
+        i=$(( i + 1 ))
+    done
+
+    widths=()
+    if [ -n "$plain" ]; then
+        while IFS= read -r char_width; do
+            widths+=("$char_width")
+        done < <(dwidth_profile "$plain")
+    fi
+
+    i=0
+    while [ "$i" -lt "$text_len" ]; do
+        char="${text:$i:1}"
+        if [ "$char" = $'\033' ]; then
+            seq="$char"
+            i=$(( i + 1 ))
+            while [ "$i" -lt "$text_len" ]; do
+                char="${text:$i:1}"
+                seq="${seq}${char}"
+                i=$(( i + 1 ))
+                [ "$char" = "m" ] && break
+            done
+            out="${out}${seq}"
+            continue
+        fi
+
+        char_width="${widths[$visible_index]:-1}"
+        if [ $(( visible_width + char_width )) -gt "$max_width" ]; then
+            truncated=1
+            break
+        fi
+        out="${out}${char}"
+        visible_width=$(( visible_width + char_width ))
+        visible_index=$(( visible_index + 1 ))
+        i=$(( i + 1 ))
+    done
+
+    [ "$truncated" -eq 1 ] && [ "$saw_sgr" -eq 1 ] && out="${out}${NC}"
+    printf '%s' "$out"
+}
+
+statusline_output_line() {
+    ansi_truncate "$1" "$STATUSLINE_BUDGET"
+    printf '\n'
+}
+
+for line in "${OUTPUT_LINES[@]}"; do
+    statusline_output_line "$line"
+done
+
 # Append the last cached sub-status result below the buddy panel and refresh
 # it asynchronously when stale. The statusline itself never waits on it.
 append_substatus

package/statusline/emoji-text.data

@@ -0,0 +1,3 @@
+# Auto-generated by scripts/gen-emoji-widths.ts — do not edit by hand.
+# Decimal codepoint ranges with Unicode Emoji=Yes and Emoji_Presentation=No.
+35,42,48-57,169,174,8252,8265,8482,8505,8596-8601,8617-8618,9000,9167,9197-9199,9201-9202,9208-9210,9410,9642-9643,9654,9664,9723-9724,9728-9732,9742,9745,9752,9757,9760,9762-9763,9766,9770,9774-9775,9784-9786,9792,9794,9823-9824,9827,9829-9830,9832,9851,9854,9874,9876-9879,9881,9883-9884,9888,9895,9904-9905,9928,9935,9937,9939,9961,9968-9969,9972,9975-9977,9986,9992-9993,9996-9997,9999,10002,10004,10006,10013,10017,10035-10036,10052,10055,10083-10084,10145,10548-10549,11013-11015,12336,12349,12951,12953,127344-127345,127358-127359,127490,127543,127777,127780-127788,127798,127869,127894-127895,127897-127899,127902-127903,127947-127950,127956-127967,127987,127989,127991,128063,128065,128253,128329-128330,128367-128368,128371-128377,128391,128394-128397,128400,128421,128424,128433-128434,128444,128450-128452,128465-128467,128476-128478,128481,128483,128488,128495,128499,128506,128715,128717-128719,128736-128741,128745,128752,128755

package/statusline/emoji-widths.data

@@ -1,4 +1,3 @@
 # Auto-generated by scripts/gen-emoji-widths.ts — do not edit by hand.
-# Decimal codepoints in U+2600-U+27BF with Unicode Emoji_Presentation=Yes.
-# Regenerate with: bun run gen:emoji-widths
-9748 9749 9800 9801 9802 9803 9804 9805 9806 9807 9808 9809 9810 9811 9855 9875 9889 9898 9899 9917 9918 9924 9925 9934 9940 9962 9970 9971 9973 9978 9981 9989 9994 9995 10024 10060 10062 10067 10068 10069 10071 10133 10134 10135 10160 10175
+# Decimal codepoint ranges with Unicode Emoji_Presentation=Yes.
+8986-8987,9193-9196,9200,9203,9725-9726,9748-9749,9800-9811,9855,9875,9889,9898-9899,9917-9918,9924-9925,9934,9940,9962,9970-9971,9973,9978,9981,9989,9994-9995,10024,10060,10062,10067-10069,10071,10133-10135,10160,10175,11035-11036,11088,11093,126980,127183,127374,127377-127386,127462-127487,127489,127514,127535,127538-127542,127544-127546,127568-127569,127744-127776,127789-127797,127799-127868,127870-127891,127904-127946,127951-127955,127968-127984,127988,127992-128062,128064,128066-128252,128255-128317,128331-128334,128336-128359,128378,128405-128406,128420,128507-128591,128640-128709,128716,128720-128722,128725-128728,128732-128735,128747-128748,128756-128764,128992-129003,129008,129292-129338,129340-129349,129351-129535,129648-129660,129664-129674,129678-129734,129736,129741-129756,129759-129770,129775-129784

package/statusline/substatus.sh

@@ -25,12 +25,24 @@ append_substatus() {
     local cache_file="$state_dir/.substatus.$sid"
     local lock_dir="$state_dir/.substatus.$sid.lock"
     local command=""
-    local now cache_age lock_age refresh_seconds configured_refresh_seconds
+    local now cache_age lock_age refresh_seconds configured_refresh_seconds line sweep_lock sweep_lock_age
 
-    # Remove abandoned refresh output without touching the complete cache or
-    # the lock directory. The refresh path below uses the same deterministic
-    # temp filename, so this also cleans up files from older implementations.
-    find "$state_dir" -type f -name ".substatus.$sid.*" -mmin +60 -exec rm -f {} \; 2>/dev/null
+    # Cleanup is intentionally detached: stale temp files are housekeeping and
+    # must not make the statusline wait on a filesystem walk. The lock keeps
+    # concurrent statusline ticks from launching duplicate sweeps.
+    sweep_lock="$state_dir/.substatus-sweep.$sid.lock"
+    if [ -d "$sweep_lock" ]; then
+        sweep_lock_age=$(( $(date +%s) - $(_substatus_mtime "$sweep_lock") ))
+        if [ "$sweep_lock_age" -gt 300 ]; then
+            rmdir "$sweep_lock" 2>/dev/null || rm -rf "$sweep_lock" 2>/dev/null
+        fi
+    fi
+    if mkdir "$sweep_lock" 2>/dev/null; then
+        (
+            trap 'rmdir "$sweep_lock" 2>/dev/null' EXIT
+            find "$state_dir" -type f -name ".substatus.$sid.*" -mmin +60 -exec rm -f {} + 2>/dev/null
+        ) >/dev/null 2>&1 &
+    fi
 
     [ -f "$config_file" ] || return 0
     command=$(jq -r '.subStatusCommand // ""' "$config_file" 2>/dev/null)
@@ -43,10 +55,21 @@ append_substatus() {
         *) [ "$configured_refresh_seconds" -gt 0 ] && refresh_seconds="$configured_refresh_seconds" ;;
     esac
 
-    # Always show the last complete result first. A missing or stale cache is
-    # allowed to be blank; the refresh below will populate the next tick.
-    [ -f "$cache_file" ] && cat "$cache_file"
-
+    # The main statusline supplies ANSI-aware output when it has a width
+    # budget. Keep this helper standalone for callers that don't.
+    _substatus_print_line() {
+        local line="$1"
+        if [ "$(type -t statusline_output_line 2>/dev/null)" = "function" ]; then
+            statusline_output_line "$line"
+        else
+            printf '%s\n' "$line"
+        fi
+    }
+    if [ -f "$cache_file" ]; then
+        while IFS= read -r line || [ -n "$line" ]; do
+            _substatus_print_line "$line"
+        done < "$cache_file"
+    fi
     now=$(date +%s)
     cache_age=999999
     if [ -f "$cache_file" ]; then
@@ -59,7 +82,11 @@ append_substatus() {
     # over a minute old, so a slow but healthy command is never duplicated.
     if [ -d "$lock_dir" ]; then
         lock_age=$(( now - $(_substatus_mtime "$lock_dir") ))
-        if [ "$lock_age" -gt 60 ]; then
+        # A refresh killed alongside its parent leaves this lock behind. The
+        # window must be short enough that a fresh session recovers within a
+        # few ticks instead of rendering no sub-status at all, but longer than
+        # a healthy slow command's runtime so it is never duplicated.
+        if [ "$lock_age" -gt 20 ]; then
             rmdir "$lock_dir" 2>/dev/null || rm -rf "$lock_dir" 2>/dev/null
         fi
     fi
@@ -85,3 +112,18 @@ append_substatus() {
         fi
     ) </dev/null > /dev/null 2>/dev/null &
 }
+
+# Claude Code kills the statusline process when the next render starts, and a
+# plain `&` child stays in that process group — so the refresh was being killed
+# mid-write, leaving a held lock and a 0-byte temp file behind. A session that
+# lost the race that way never rendered a sub-status at all.
+#
+# setsid detaches into a new session so the refresh survives; it is Linux-only,
+# so fall back to nohup (which at least survives SIGHUP) on macOS.
+_substatus_detach() {
+    if command -v setsid >/dev/null 2>&1; then
+        setsid "$@" </dev/null >/dev/null 2>&1 &
+    else
+        nohup "$@" </dev/null >/dev/null 2>&1 &
+    fi
+}