newsline-cli 1.0.1 → 1.0.3

package/README.md

@@ -71,6 +71,7 @@ Re-run `newsline init`, or edit `~/.config/newsline/config.json`:
 | `maxlen` | `120` | max characters (`max` = no cut) |
 | `icon` | `📰` | leading glyph (`none` to hide) |
 | `color` | `magenta` | headline color: `default` `gray` `white` `cyan` `yellow` `green` `blue` `magenta` `red` |
+| `clickhint` | `auto` | click-modifier hint before the headline (`auto` per terminal, `off` to hide, or custom text) |
 
 Set one directly with `newsline color <name>` (e.g. `newsline color gray`), or run
 `newsline color` with no name to step to the next color (default → gray → white → cyan →
@@ -98,7 +99,13 @@ Claude Code plugin: run `/plugin marketplace update itdar`, then `/reload-plugin
 ## Uninstall
 
 ```sh
-newsline uninstall      # restores your previous status line
+newsline uninstall           # restores your previous status line
+newsline uninstall --purge   # also removes the CLI binary + the PATH line install.sh added
 ```
 
 Needs `bash` + `python3` (macOS / Linux; Windows via WSL).
+
+## Contributing
+
+Bug reports and PRs welcome — see [CONTRIBUTING.md](CONTRIBUTING.md) for local setup,
+testing, and the release process.

package/install.sh

@@ -34,6 +34,32 @@ ln -sf "$SHARE/newsline" "$BIN/newsline"
 
 echo "✔ installed: $BIN/newsline"
 
+# Garbage-collect stale PATH lines from earlier installs whose prefix no longer
+# exists (e.g. throwaway test prefixes), so rc files don't pile up dead newsline
+# entries that shadow the current install. Only drops blocks whose dir is gone.
+prune_stale_newsline_path() { # $1 = rc file
+  [ -f "$1" ] || return 0
+  awk '
+    /^# added by newsline installer$/ {
+      marker=$0
+      if ((getline pl) > 0) {
+        keep=1
+        if (match(pl, /\/[^ "]*\/bin/)) {
+          d=substr(pl, RSTART, RLENGTH)
+          if (system("[ -d \"" d "\" ]") != 0) keep=0
+        }
+        if (keep) { print marker; print pl }
+        next
+      }
+      print marker; next
+    }
+    { print }
+  ' "$1" > "$1.nltmp" 2>/dev/null && mv "$1.nltmp" "$1"
+}
+for rc in "$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.profile" "$HOME/.config/fish/config.fish"; do
+  prune_stale_newsline_path "$rc"
+done
+
 # Register $BIN on PATH for future shells (idempotent), by shell rc file.
 case ":$PATH:" in
   *":$BIN:"*)

package/newsline

@@ -80,7 +80,8 @@ import json,sys,shlex
 env={"lang":"NEWSLINE_LANG","topic":"NEWSLINE_TOPIC","rotate":"NEWSLINE_ROTATE",
      "count":"NEWSLINE_COUNT","maxlen":"NEWSLINE_MAXLEN","icon":"NEWSLINE_ICON",
      "color":"NEWSLINE_COLOR","linkhint":"NEWSLINE_LINKHINT","api":"NEWSLINE_API",
-     "endpoint":"NEWSLINE_ENDPOINT","base_statusline":"NEWSLINE_BASE"}
+     "endpoint":"NEWSLINE_ENDPOINT","base_statusline":"NEWSLINE_BASE",
+     "clickhint":"NEWSLINE_CLICKHINT"}
 try: d=json.load(open(sys.argv[1]))
 except Exception: d={}
 for k,name in env.items():
@@ -154,12 +155,12 @@ cmd_once() {
 }
 
 cmd_init() {
-  local lang="" topic="" color="" api="" endpoint="" rotate="6" count="15" compose="auto" yes="0" base_override="" a
+  local lang="" topic="" color="" api="" endpoint="" rotate="6" count="15" compose="auto" yes="0" base_override="" rotate_set=0 a
   while [ $# -gt 0 ]; do
     case "$1" in
       --lang) lang="$2"; shift 2;;      --topic) topic="$2"; shift 2;;
       --api) api="$2"; shift 2;;        --endpoint) endpoint="$2"; shift 2;;
-      --rotate) rotate="$2"; shift 2;;  --count) count="$2"; shift 2;;
+      --rotate) rotate="$2"; rotate_set=1; shift 2;;  --count) count="$2"; shift 2;;
       --base) base_override="$2"; shift 2;;
       --compose) compose="yes"; shift;; --no-compose) compose="no"; shift;;
       --settings) SETTINGS="$2"; shift 2;; --yes|-y) yes="1"; shift;;
@@ -181,26 +182,42 @@ cmd_init() {
       local avail c; local -a menu=(auto "Auto-detect (now: $(lang_label "$detected"))")
       avail=$(python3 -c "import json,sys;d=json.load(open(sys.argv[1]));print(' '.join(k for k in d if k not in ('default','_comment')))" "$HERE/feeds.json" 2>/dev/null)
       for c in $avail; do menu+=("$c" "$(lang_label "$c")"); done
-      echo "Select news language:" >&2
+      echo "Newsline language?" >&2
       choose "$detected" "${menu[@]}"; lang="$CHOICE"
     fi
     if [ -z "$topic" ]; then
-      echo "Select topic:" >&2
+      echo "Newsline topic?" >&2
       choose general \
         general "General" tech "Tech" business "Business" world "World" \
         sports "Sports" science "Science" health "Health" entertainment "Entertainment"
       topic="$CHOICE"
     fi
     local cur_color; cur_color=$(cfg_get color)
-    echo "Select headline color (change anytime: newsline color):" >&2
+    echo "Newsline color?" >&2
     choose "${cur_color:-magenta}" \
       default "Terminal default" cyan "Cyan" gray "Gray" white "White" \
       yellow "Yellow" green "Green" blue "Blue" magenta "Magenta" red "Red"
     color="$CHOICE"
+    if [ "$rotate_set" = "0" ]; then
+      # rotation interval — free-form seconds; blank/invalid keeps the current value
+      local cur_rotate; cur_rotate=$(cfg_get rotate); [ -n "$cur_rotate" ] || cur_rotate="$rotate"
+      echo "Newsline seconds?" >&2
+      printf "  # [%s]: " "$cur_rotate" >&2
+      local sel_rotate; read -r sel_rotate < "${NL_TTY:-/dev/stdin}"
+      case "$sel_rotate" in
+        ''|*[!0-9]*) rotate="$cur_rotate" ;;   # blank or non-numeric -> keep current
+        *)           rotate="$sel_rotate" ;;
+      esac
+      [ "$rotate" -ge 1 ] 2>/dev/null || rotate=6
+    fi
   else
     # --yes: keep a color previously set via init/`newsline color`; magenta on first run
     lang="${lang:-$detected}"; topic="${topic:-general}"
     color=$(cfg_get color); [ -n "$color" ] || color="magenta"
+    # keep an existing rotation interval on re-init unless --rotate was given
+    if [ "$rotate_set" = "0" ]; then
+      local saved_rotate; saved_rotate=$(cfg_get rotate); [ -n "$saved_rotate" ] && rotate="$saved_rotate"
+    fi
   fi
 
   # Always KEEP an existing status line and show newsline below it (no prompt).
@@ -342,6 +359,8 @@ PY
 }
 
 cmd_uninstall() {
+  local purge=0 a
+  for a in "$@"; do case "$a" in --purge|-p) purge=1 ;; esac; done
   local base base_obj
   base=$(cfg_get base_statusline)
   base_obj=$(cfg_get_obj base_statusline_obj)
@@ -378,19 +397,62 @@ PY
   local cache="${NEWSLINE_CACHE:-$HOME/.cache/newsline}"
   rm -f "$CONFIG" "$cache/line" "$cache/feeds.resolved.json" "$cache/feeds.resolved.ok" "$cache/notice" 2>/dev/null
   echo "✔ newsline uninstalled."
+
+  [ "$purge" = "1" ] || return 0
+  # --purge: also remove the CLI binary + the PATH line install.sh added. Only for
+  # the install.sh layout ($PREFIX/share/newsline + $PREFIX/bin/newsline); a
+  # package-managed install (brew/npm) is left to its own package manager.
+  case "$HERE" in
+    */share/newsline)
+      local prefix bin rc
+      prefix="$(cd "$HERE/../.." 2>/dev/null && pwd)"; bin="$prefix/bin"
+      if [ -e "$bin/newsline" ]; then
+        rm -f "$bin/newsline"
+        rm -rf "$HERE"                       # $PREFIX/share/newsline (this script's dir)
+        for rc in "$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.profile" "$HOME/.config/fish/config.fish"; do
+          [ -f "$rc" ] || continue
+          awk -v bin="$bin" '
+            function strip(p){ sub(/^\/private/, "", p); return p }   # macOS /var == /private/var
+            /^# added by newsline installer$/ {
+              marker=$0
+              if ((getline pl) > 0) {
+                drop=0
+                if (match(pl, /\/[^ "]*\/bin/)) {
+                  d=substr(pl, RSTART, RLENGTH)
+                  if (strip(d) == strip(bin)) drop=1   # our block -> drop marker + path line
+                }
+                if (drop) next
+                print marker; print pl; next
+              }
+              print marker; next
+            }
+            { print }
+          ' "$rc" > "$rc.nltmp" 2>/dev/null && mv "$rc.nltmp" "$rc"
+        done
+        echo "✔ purged CLI: removed $bin/newsline and its PATH entry (open a new shell to refresh PATH)."
+      else
+        echo "ℹ nothing to purge (no $bin/newsline)."
+      fi
+      ;;
+    *)
+      echo "ℹ this CLI wasn't installed via install.sh (looks package-managed);"
+      echo "  remove it with:  brew uninstall newsline   or   npm uninstall -g newsline-cli"
+      ;;
+  esac
 }
 
 usage() {
   cat <<'EOF'
 newsline — local news status-line utility
   newsline init [--lang ko] [--topic tech]    set up & wire the status line
-                                              (asks language / topic / color)
+                [--rotate SECS]               (asks language / topic / color / rotation)
   newsline color [name]                       set headline color (e.g. cyan, gray); with
                                               no name, step to the next: default → gray →
                                               white → cyan → yellow → green → blue →
                                               magenta → red → back to default
   newsline colorlist                          list the available colors with a preview
-  newsline uninstall                          remove & restore previous status line
+  newsline uninstall [--purge]                remove & restore previous status line
+                                              (--purge also deletes the CLI + PATH line)
 EOF
   if [ "${1:-}" = "--all" ]; then
     cat <<'EOF'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newsline-cli",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Locale-aware one-line news in your Claude Code status line — local, composes with your existing status line.",
   "bin": {
     "newsline": "newsline"

package/readme/ko.md

@@ -68,6 +68,7 @@ npm i -g newsline-cli && newsline init
 | `maxlen` | `120` | 최대 글자수 (`max`=무제한) |
 | `icon` | `📰` | 앞 아이콘 (`none`이면 제거) |
 | `color` | `magenta` | 뉴스 글자 색: `default` `gray` `white` `cyan` `yellow` `green` `blue` `magenta` `red` |
+| `clickhint` | `auto` | 헤드라인 앞 클릭 안내 (`auto`=터미널별 자동, `off`=숨김, 또는 직접 지정) |
 
 `newsline color <이름>`으로 색을 바로 지정하거나(예: `newsline color gray`), 이름 없이
 `newsline color`를 실행하면 다음 색으로 넘어갑니다 (default → gray → white → cyan →

package/refresh.sh

@@ -23,7 +23,7 @@ case "$API" in off|OFF|none|local) API="" ;; esac
 COUNT="${NEWSLINE_COUNT:-15}"         # how many headlines to cache for rotation
 # Client version, sent to /feed as ?v= for the server-side update nudge.
 # Bump together with package.json when tagging a release.
-export NEWSLINE_VERSION="${NEWSLINE_VERSION:-1.0.1}"
+export NEWSLINE_VERSION="${NEWSLINE_VERSION:-1.0.3}"
 LOCK="$CACHE_DIR/refresh.lock"
 mkdir -p "$CACHE_DIR" 2>/dev/null
 

package/statusline.sh

@@ -42,6 +42,23 @@ colorize() { # wrap text in the configured color (no-op when unset); no newline
   if [ -n "$SGR" ]; then printf '\033[%sm%s\033[0m' "$SGR" "$1"; else printf '%s' "$1"; fi
 }
 
+# --- per-terminal click hint, printed dim before the headline, e.g. "(Cmd+Click)" ---
+# Headlines are OSC 8 hyperlinks; WHICH modifier opens them is the terminal's call,
+# not ours (macOS terminals use Cmd, most others Ctrl, kitty Ctrl+Shift). Show the
+# right one so users know how to click through. NEWSLINE_CLICKHINT: unset/auto/on =
+# auto-detect; off/none/0 = hide; any other value is used verbatim (e.g. "⌘-click").
+click_hint() {
+  case "$(printf '%s' "${NEWSLINE_CLICKHINT:-}" | tr '[:upper:]' '[:lower:]')" in
+    off|none|no|0|false) return 0 ;;                                      # hidden
+    ''|auto|on|yes|1|true) ;;                                             # auto-detect
+    *) printf '\033[90m(%s)\033[0m ' "$NEWSLINE_CLICKHINT"; return 0 ;;   # custom label
+  esac
+  local sys="${OSTYPE:-}"; [ -n "$sys" ] || sys="$(uname -s 2>/dev/null)"
+  local mod; case "$sys" in [Dd]arwin*) mod="Cmd+Click" ;; *) mod="Ctrl+Click" ;; esac
+  { [ -n "${KITTY_WINDOW_ID:-}" ] || [ "${TERM:-}" = "xterm-kitty" ]; } && mod="Ctrl+Shift+Click"
+  printf '\033[90m(%s)\033[0m ' "$mod"
+}
+
 # --- print one headline, rotating across the cached set by wall-clock time ---
 # The cache holds N headlines (one per line). We show a different one every
 # NEWSLINE_ROTATE seconds — a ticker feel with zero stored state.
@@ -53,6 +70,7 @@ if [ -s "$CACHE_FILE" ]; then
     [ "$rot" -ge 1 ] || rot=6            # 0 would divide by zero below
     now="${NEWSLINE_NOW:-$(date +%s)}"   # NEWSLINE_NOW overrides clock (tests/debug)
     idx=$(( (now / rot) % n + 1 ))
+    click_hint                            # "(Cmd+Click)" etc., before the linked headline
     colorize "$(sed -n "${idx}p" "$CACHE_FILE")"; printf '\n'
   else
     colorize '📰 …'