@inbrace-tech/tokenline 1.5.0 → 1.5.2

package/README.md

@@ -192,7 +192,7 @@ Other commands: `update` (replace the installed script, see [Updating](#updating
 
 ## How it works
 
-On every refresh the host CLI pipes a JSON snapshot of the session to the script over stdin. `tokenline` parses it in a single `jq` pass (to keep the per-second refresh cheap), reads the last turn's timestamp from the transcript to drive the cache countdown, and renders up to three lines. Per-turn timestamps (and, for subagent rows, each subagent's last-turn time, TTL and last tool name) are cached in a per-user `0700` directory under `$XDG_RUNTIME_DIR` (tmpfs, cleared on logout); the payload itself never touches disk.
+On every refresh the host CLI pipes a JSON snapshot of the session to the script over stdin. `tokenline` parses it in a single `jq` pass (to keep the per-second refresh cheap), reads the last turn's timestamp from the transcript to drive the cache countdown, and renders up to three lines. Per-turn timestamps (and, for subagent rows, each subagent's last-turn time, TTL and last tool name) are cached in a per-user `0700` directory under `$XDG_RUNTIME_DIR` (tmpfs, cleared on logout), or under `$TMPDIR` / `/tmp` when that is unset or doesn't exist (WSL2 without systemd, containers, macOS); the payload itself never touches disk.
 
 ## Troubleshooting
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inbrace-tech/tokenline",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "A cache-aware statusline for AI coding CLIs — installs tokenline.sh and wires it into your Claude Code settings.",
   "bin": {
     "tokenline": "dist/cli.js"

package/tokenline.sh

@@ -91,11 +91,28 @@ file_mtime() {
 # Per-turn timestamp / TTL are cached between the 1s refreshes. Prefer a
 # per-user dir (0700) under XDG_RUNTIME_DIR: it avoids predictable, world-
 # readable paths in shared /tmp (and the symlink/collision risks they carry),
-# and is tmpfs cleared on logout — so no orphan-file cleanup is needed. Falls
-# back to /tmp when XDG_RUNTIME_DIR is unset.
-_runtime_dir="${XDG_RUNTIME_DIR:-/tmp}/tokenline-${UID:-$(id -u)}"
-mkdir -p "$_runtime_dir" 2>/dev/null && chmod 700 "$_runtime_dir" 2>/dev/null
-[ -d "$_runtime_dir" ] || _runtime_dir="/tmp"
+# and is tmpfs cleared on logout — so no orphan-file cleanup is needed.
+# XDG_RUNTIME_DIR can be unset, or set to a dir that doesn't exist (WSL2
+# without systemd, containers, su/sudo shells), so the candidates are tried in
+# order: $XDG_RUNTIME_DIR/tokenline-<uid> when that parent is a dir we own, then
+# ${TMPDIR:-/tmp}/tokenline-<uid>. Bare /tmp is the last resort, and every
+# feature that needs a private dir (update notice, subagent state) stays off there.
+_use_runtime_dir() {
+  # Accepts $1 only as a real directory (not a symlink) owned by this user,
+  # creating it 0700 when missing. No -p: the parent must already exist.
+  local d="$1"
+  [ -d "$d" ] || mkdir -m 700 "$d" 2>/dev/null
+  [ -d "$d" ] && [ ! -L "$d" ] && [ -O "$d" ] || return 1
+  chmod 700 "$d" 2>/dev/null
+  _runtime_dir="$d"
+}
+_runtime_dir="/tmp"
+_uid="${UID:-$(id -u)}"
+if ! { [ -n "${XDG_RUNTIME_DIR:-}" ] && [ -d "$XDG_RUNTIME_DIR" ] && [ -O "$XDG_RUNTIME_DIR" ] \
+    && _use_runtime_dir "${XDG_RUNTIME_DIR%/}/tokenline-$_uid"; }; then
+  _tmp_base="${TMPDIR:-/tmp}"
+  _use_runtime_dir "${_tmp_base%/}/tokenline-$_uid"
+fi
 
 # --- 1. Parse JSON Standard Input and Prepare State Variables ---
 parse_and_prepare_paths() {
@@ -871,9 +888,9 @@ render_subagent_rows() {
   # the rows line up under each other.
   local -a ids types glyphs models efforts elapsed ctx cache activity descs
   local w_type=0 w_model=0 w_effort=0 w_elapsed=0 w_ctx=0 w_cache=0 w_act=0
-  local line id name type status desc start_ms tokens window model effort aid
+  local line id name type status desc start_ms tokens window model effort agent_type aid
   for line in "${rows[@]}"; do
-    IFS="$_sa_sep" read -r id name type status desc start_ms tokens window model effort <<< "$line"
+    IFS="$_sa_sep" read -r id name type status desc start_ms tokens window model effort agent_type <<< "$line"
     [ -z "$id" ] && continue
 
     aid="${id#agent-}"
@@ -886,7 +903,10 @@ render_subagent_rows() {
     # cache still matters — show it as running (activity, blinking COLD).
     [ "$sa_mode" = "waiting-bg" ] && status="running"
 
-    local t="${type:-$name}"
+    # `type` is the task kind (always "local_agent" for a subagent); the
+    # subagent's own type ("Explore", "code-reviewer") is `agentType`, which
+    # only newer Claude Code versions send. Fall back to name, then kind.
+    local t="${agent_type:-${name:-$type}}"
     t=$(fit "${t:-agent}" 24)
 
     # A finished subagent's clock stops at its last turn, not at "now".
@@ -1012,7 +1032,7 @@ maybe_render_subagents() {
         | [ (.id // ""), (.name // ""), (.type // ""), (.status // ""),
             (.description // .label // ""), (.startTime // 0),
             (.tokenCount // 0), (.contextWindowSize // 0),
-            (.model // ""), (.effort // "") ]
+            (.model // ""), (.effort // ""), (.agentType // "") ]
         | map(clean) | join("\u001f"))
     else empty end' 2>/dev/null)
   [[ "$extracted" == subagents* ]] || return 1