newsline-cli 0.1.2 → 0.1.4

package/newsline

@@ -250,7 +250,7 @@ PY
 
   # apply the new language/topic on the next render, not after the old cache expires
   local cache="${NEWSLINE_CACHE:-$HOME/.cache/newsline}"
-  rm -f "$cache/line" "$cache/feeds.resolved.json" "$cache/feeds.resolved.ok" 2>/dev/null
+  rm -f "$cache/line" "$cache/feeds.resolved.json" "$cache/feeds.resolved.ok" "$cache/notice" 2>/dev/null
 
   echo "✔ newsline installed (lang=$lang, topic=$topic)."
   [ -n "$base" ] && echo "  composing with your existing status line — it stays visible above the news."
@@ -292,7 +292,7 @@ else:
     print("status line not managed by newsline; left as-is")
 PY
   local cache="${NEWSLINE_CACHE:-$HOME/.cache/newsline}"
-  rm -f "$CONFIG" "$cache/line" "$cache/feeds.resolved.json" "$cache/feeds.resolved.ok" 2>/dev/null
+  rm -f "$CONFIG" "$cache/line" "$cache/feeds.resolved.json" "$cache/feeds.resolved.ok" "$cache/notice" 2>/dev/null
   echo "✔ newsline uninstalled."
 }
 

package/package.json

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

package/refresh.sh

@@ -16,6 +16,9 @@ FEEDS="${NEWSLINE_FEEDS:-$HERE/feeds.json}"
 # through it so monetization can be switched on later WITHOUT re-shipping.
 ENDPOINT="${NEWSLINE_ENDPOINT:-https://newsline.thesockerrr.workers.dev/r}"
 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:-0.1.4}"
 LOCK="$CACHE_DIR/refresh.lock"
 mkdir -p "$CACHE_DIR" 2>/dev/null
 
@@ -82,6 +85,34 @@ if [ "$need_resolve" = "1" ]; then
   fi
 fi
 
+# --- server-driven update nudge: one extra line below the news --------------
+# If the server flagged this client as too old (RESOLVED has "_update"),
+# write the notice line statusline.sh appends; otherwise clear it. Skipped
+# (cleared) when this client already meets minVersion, so the nudge stops
+# right after an update even while the old RESOLVED is still cached.
+NOTICE="$CACHE_DIR/notice"
+msg=$(python3 -c '
+import json, os, sys
+try:
+    u = json.load(open(sys.argv[1])).get("_update") or {}
+except Exception:
+    u = {}
+def pv(s): return [int(x) if x.isdigit() else 0 for x in str(s).split(".")]
+mv, cur = u.get("minVersion", ""), os.environ.get("NEWSLINE_VERSION", "")
+print("" if (mv and cur and pv(cur) >= pv(mv)) else u.get("message", ""))
+' "$RESOLVED" 2>/dev/null | tr -d '\000-\037')
+if [ -n "$msg" ]; then
+  case "$HERE" in                      # install channel by where we live
+    *"/node_modules/"*)      ucmd="npm i -g newsline-cli" ;;
+    *[Cc]ellar*|*linuxbrew*) ucmd="brew upgrade newsline" ;;
+    *) ucmd="curl -fsSL https://raw.githubusercontent.com/itdar/cc-plugin/master/install.sh | sh" ;;
+  esac
+  # yellow line, command in bold bright yellow — mirrors Claude Code's own update nudge
+  printf '\033[33m[%s] Run: \033[1;93m%s\033[0m\n' "$msg" "$ucmd" > "$NOTICE.tmp" && mv -f "$NOTICE.tmp" "$NOTICE"
+else
+  rm -f "$NOTICE" 2>/dev/null
+fi
+
 # --- fetch + parse + build the line; write atomically, keep old cache on failure ---
 if python3 "$HERE/fetch.py" "$lang" "$RESOLVED" "$ENDPOINT" "$COUNT" > "$CACHE_DIR/line.tmp" 2>/dev/null \
    && [ -s "$CACHE_DIR/line.tmp" ]; then

package/resolve.py

@@ -2,9 +2,11 @@
 """newsline · resolve which feeds to use — server-first, local fallback, topic-aware.
 
 Tries the operator's curation API (NEWSLINE_API) with a short timeout, sending only
-COARSE CONTEXT (lang, country, localtime, dow, tz, topic) — never personal data. On
-ANY failure it falls back to the bundled feeds.json. If a topic preference is set
-(NEWSLINE_TOPIC), a keyless Google News topic feed is prepended so that topic leads.
+COARSE CONTEXT (lang, country, localtime, dow, tz, topic) — never personal data.
+The server's list is used AS-IS (it handles topic: vertical partners first, then
+Google's topic feed). Only when the server is unreachable does the local fallback
+kick in: bundled feeds.json, with a keyless Google News topic feed prepended if a
+topic preference is set (NEWSLINE_TOPIC) so the topic still leads offline.
 
 Prints a feeds.json-shaped object fetch.py consumes:  {"<lang>": [...], "default": [...]}
 
@@ -62,6 +64,7 @@ def local_feeds(lang, path):
 
 
 def server_feeds(lang, api_base):
+    """Return (feeds_or_None, update_or_None) from the curation API."""
     params = {
         "lang": lang,
         "country": os.environ.get("NEWSLINE_COUNTRY", ""),
@@ -69,18 +72,22 @@ def server_feeds(lang, api_base):
         "dow": os.environ.get("NEWSLINE_DOW", ""),
         "tz": os.environ.get("NEWSLINE_TZ", ""),
         "topic": os.environ.get("NEWSLINE_TOPIC", ""),
+        "v": os.environ.get("NEWSLINE_VERSION", ""),
     }
     url = api_base.rstrip("/") + "/feed?" + urllib.parse.urlencode(params)
     req = urllib.request.Request(url, headers={"User-Agent": "newsline/0.1"})
     obj = json.loads(urllib.request.urlopen(req, timeout=TIMEOUT).read())
+    update = obj.get("update")
+    if not isinstance(update, dict):
+        update = None
     feeds = obj.get("feeds")
     if isinstance(feeds, list):
         # fetch.py urlopens these — accept only http(s) URLs
         feeds = [x for x in feeds
                  if isinstance(x, str) and x.startswith(("http://", "https://"))]
-        if feeds:
-            return feeds
-    return None
+    else:
+        feeds = None
+    return (feeds or None), update
 
 
 def main():
@@ -91,22 +98,26 @@ def main():
 
     local_urls, default = local_feeds(lang, local_path)
 
-    feeds = None
+    feeds = update = None
     if api_base:
         try:
-            feeds = server_feeds(lang, api_base)   # server-first
+            feeds, update = server_feeds(lang, api_base)   # server-first, used AS-IS
         except Exception:
-            feeds = None                            # any issue -> local fallback
-    feeds = feeds or local_urls or default
-
-    # topic preference leads (keyless Google News topic feed), general as backup
-    tfeed = topic_feed(lang, os.environ.get("NEWSLINE_COUNTRY", ""), os.environ.get("NEWSLINE_TOPIC", ""))
-    if tfeed:
-        feeds = [tfeed] + [f for f in feeds if f != tfeed]
+            feeds, update = None, None              # any issue -> local fallback
+    if not feeds:
+        # server unreachable: bundled feeds, topic preference prepended locally
+        feeds = local_urls or default
+        tfeed = topic_feed(lang, os.environ.get("NEWSLINE_COUNTRY", ""),
+                           os.environ.get("NEWSLINE_TOPIC", ""))
+        if tfeed:
+            feeds = [tfeed] + [f for f in feeds if f != tfeed]
 
     if not feeds:
         return 1
-    sys.stdout.write(json.dumps({lang: feeds, "default": default or feeds}, ensure_ascii=False))
+    out = {lang: feeds, "default": default or feeds}
+    if update:
+        out["_update"] = update   # refresh.sh turns this into the notice line
+    sys.stdout.write(json.dumps(out, ensure_ascii=False))
     return 0
 
 

package/statusline.sh

@@ -42,3 +42,10 @@ if [ -s "$CACHE_FILE" ]; then
 else
   printf '📰 …'   # first run, before the first refresh lands
 fi
+
+# --- server-driven update nudge (written/cleared by refresh.sh), below the news ---
+NOTICE_FILE="$CACHE_DIR/notice"
+if [ -s "$NOTICE_FILE" ]; then
+  [ -s "$CACHE_FILE" ] || printf '\n'   # placeholder path prints without a newline
+  head -1 "$NOTICE_FILE"
+fi