@getrift/rift 0.1.0-beta.20 → 0.1.0-beta.22

package/operator/swiftbar/render-menu.py

@@ -113,12 +113,13 @@ def time_until(iso, now):
     return "in " + fmt_duration(delta)
 
 
-def fmt_tokens(n):
+def fmt_token_count(n):
+    """Compact magnitude for a token count: '~800', '~31k', '~1.2M'."""
     if n >= 1_000_000:
-        return "~{:.1f}M context tokens".format(n / 1_000_000).replace(".0M", "M")
+        return "~{:.1f}M".format(n / 1_000_000).replace(".0M", "M")
     if n >= 1_000:
-        return "~{}k context tokens".format(round(n / 1_000))
-    return f"~{n} context tokens"
+        return "~{}k".format(round(n / 1_000))
+    return f"~{n}"
 
 
 # Friendly labels for the three Memory windows, mapped to their keys in the
@@ -129,22 +130,40 @@ def fmt_tokens(n):
 # emits `today` still renders cleanly.
 MEMORY_PERIODS = (("Today", "today"), ("This month", "month"), ("All time", "all_time"))
 
-
-def memory_window_row(label, hits, tokens):
-    """One '<Label>: N useful recalls · ~tokens' row, or a calm zero state."""
+# The "saved ~X tokens of reading" clause is HELD until the source-size metric
+# (`context_tokens_saved_estimate`, PR #66) has broad enough coverage to be
+# per-window meaningful. It is forward-only — `source_tokens_estimate` is logged
+# only from the daemon redeploy onward, and historical/all-time rows can never
+# be back-filled — so today a single measured call smears the same number across
+# every window, which reads as broken. Logging continues (data accumulates); only
+# this menu line is held. Flip to True once coverage is broad (target: next beta),
+# ideally alongside a per-window saved-measured-hits gate so the figure only shows
+# where it's genuinely supported. See the #66 follow-up.
+SHOW_SAVED_TOKENS = False
+
+
+def memory_window_row(label, hits, saved_tokens):
+    """One '<Label>: N useful recalls' row (+ optional saved clause).
+
+    The recall count is the honest hero — a recall is a discrete unit of help.
+    The 'saved ~tokens of reading' clause is the value figure, but it is gated
+    behind SHOW_SAVED_TOKENS: until the source-size metric has broad per-window
+    coverage, a single measured call would print the same number on every
+    window. While held, rows collapse cleanly to just the recall count.
+    """
     if hits <= 0:
         return f"{label}: nothing yet"
     parts = [f"{hits:,} useful recall" + ("" if hits == 1 else "s")]
-    if isinstance(tokens, int) and tokens > 0:
-        parts.append(fmt_tokens(tokens))
+    if SHOW_SAVED_TOKENS and isinstance(saved_tokens, int) and saved_tokens > 0:
+        parts.append(f"saved {fmt_token_count(saved_tokens)} tokens of reading")
     return f"{label}: " + " · ".join(parts)
 
 
 def memory_section(mcp):
     """Friendly 'Memory' section lines (header + period rows), or [].
 
-    Reads today / month / all-time recall + context-token counts straight
-    from /stats/mcp-usage and prints them in plain language. Returns [] when
+    Reads today / month / all-time recall counts + reading-saved estimates
+    straight from /stats/mcp-usage and prints them in plain language. Returns [] when
     the stats payload is missing or carries none of the expected windows, so
     the menu degrades gracefully (section omitted, Rift still healthy) rather
     than showing an error. A history with no recalls anywhere collapses to a
@@ -161,8 +180,8 @@ def memory_section(mcp):
         hits = window.get("context_hits")
         if not isinstance(hits, int):
             continue
-        tokens = window.get("context_tokens_delivered_estimate")
-        present.append((label, hits, tokens))
+        saved = window.get("context_tokens_saved_estimate")
+        present.append((label, hits, saved))
         if hits > 0:
             any_activity = True
     if not present:
@@ -175,7 +194,7 @@ def memory_section(mcp):
     if not any_activity and len(present) == len(MEMORY_PERIODS):
         return ["Memory", "Nothing recalled yet — Rift learns as you use it"]
     return ["Memory"] + [
-        memory_window_row(label, hits, tokens) for label, hits, tokens in present
+        memory_window_row(label, hits, saved) for label, hits, saved in present
     ]
 
 
@@ -271,8 +290,31 @@ def has_doctor_report(doctor):
     return isinstance(doctor, dict) and "healthy" in doctor
 
 
+# The Rift brand mark ("smooth bloom": a 4x4 memory grid, cells bright in the
+# top-right fading toward the bottom-left), rendered to a 144px PNG and
+# base64-embedded so render-menu.py stays a single self-contained file — it is
+# symlinked/copied standalone into SwiftBar's plugins dir, so an external asset
+# would add a path-resolution surface. Shipped as a `templateImage`: macOS
+# ignores RGB and tints the ALPHA mask to the menu-bar color (adapting to
+# light/dark), so the bloom is baked into alpha (black ink, per-cell
+# opacity), with no background container. DO NOT hand-edit this constant —
+# regenerate from the locked logo: `python3 generate-icon.py` (source of
+# truth: assets/rift-mark.svg).
+RIFT_ICON_B64 = "iVBORw0KGgoAAAANSUhEUgAAAJAAAACQCAYAAADnRuK4AAAEBUlEQVR42u3cwUpVQRyAcbGkIsrQhYTG5UKJIAhuJFyEJLSQuxTcuU7aCG5a6rK1PUT0AkJv4Cp6Ane9Rs2hczYH7pzT3DnaxO+Db+fwF+a7C50/d24OAAAAAAAAAAAAAAAAAAAAAABk535wHNwNvk1wtz5/v8esh8G94GnwPMHT+vzDHrOeBE+CV8EfCV7V55/0mPWs/v1ugr8SvKnPPysxnp3EcNrudERUXfr7xHDavu+IqLr0r4nhtP3aEVF16d8Tw2n7vbSIxpniaRxHZu1liqdxLzLrJFM8jSeRWeeZ4mk8Lymg3cwB7UZmnWYO6DQy6ypzQFeRWTeZA7opKaC3Axj7pOZ2Gj8GcBq/BlBAAhKQgAQkIAEJSEACEpCABCQgAQlIQAISkIAEJCABCUhAAhLQHeM13mv8TNgHsg80EzYSbSRmichOtJ1oAAAAAEAR3AuuBDeCWwlu1Ofv9Zi1ENwMToJHCU7q8ws9Zj0OHgYvg18SvKzPP+4x62nwLHgd/JngdX3+aYnxvEoMp+2rjoiqS3+XGE7bdx0RVZf+KTGctp86Iqou/VtiOG2/lRbRSqZ4GlciszYzxdO4GZl1mCmexsPIrLNM8TSelRTQRuaANiKzJpkDmkRmXWYO6DIy6zpzQNclBbQ1gNM4GsBpfBnAafwcQAEJSEACEpCABCQgAQlIQAISkIAEJCABCUhAAhKQgAQkIAEJSEB3jNd4r/EzYR/IPtBM2Ei0kZglIjvRdqIBAAAAAEUwH1wKjoIvExzV5+d7zKq+xWwtuB18neB2fb7Pt6E9mPvztXvHwQ8JHtfnH/SY9Sh4ELwIfk7woj7/qMR4XiSG0/ZFR0TVpW8lhtN2qyOi6tKPEsNpe9QRUXXpHxPDafuxtIiWMsXTuBSZtZYpnsa1yKydTPE07kRmHWSKp/GgpIBGmQMaRWZtZw5oOzLrOHNAx5FZF5kDuigpoJcDOI3XAziNDwM4jc8DKCABCUhAAhKQgAQkIAEJSEACEpCABCQgAQlIQAISkIAEJCABCeiO8RrvNX4m7APZB5oJG4k2ErNEZCfaTjQAAAAAoJg/4xeDq/Wf5H/ran1+vues5eA4uJ7guD7/r/3LYKH+/fbn/nyL2t+6X59fKDGe54nhtH3ecbHz9c+tZ3A09+/807K69DeJ4bR9U1pEi5niaVyMzFrOFE/jcmTWbT6brGeKp3G9pIBWMwe0Gpk1zhzQODLrNh9u9zMHtF9SQKMBjH1SczuN21wdmQyggAQkIAEJSEACEpCABCQgAQlIQAISkIAEJCABCUhAAhKQgAQkoDvGa7zX+JmwD2QfaCZsJNpIzBKRnWg70QAAAAAAAAAAAAAAAAAAAAAA/J/8BkPYO9tuFesnAAAAAElFTkSuQmCC"
+# width/height are required: SwiftBar renders a custom image at its decoded
+# pixel size (144px here) unless both are set, which would oversize the icon
+# and distort menu-bar spacing. 18pt matches the menu-bar glyph height; the
+# 144px source downscales crisply on retina.
+_RIFT_TITLE = f"Rift | templateImage={RIFT_ICON_B64} width=18 height=18"
+
+# Hybrid menu-bar title: the Rift brand mark when healthy (calm, branded), but
+# a colored SF Symbol when something needs attention so the alert stays legible
+# at a glance without opening the dropdown. SwiftBar renders one image per title
+# line and force-tints a `templateImage` to monochrome, so color has to come
+# from the sfimage/sfcolor path — hence the brand mark is healthy-only. The
+# detailed verdict still renders inside the dropdown for every state.
 TITLES = {
-    "healthy": "Rift | sfimage=circle.fill sfcolor=systemGreen",
+    "healthy": _RIFT_TITLE,
     "warning": "Rift | sfimage=exclamationmark.circle.fill sfcolor=systemYellow",
     "broken": "Rift | sfimage=exclamationmark.triangle.fill sfcolor=systemRed",
     "unknown": "Rift | sfimage=questionmark.circle.fill sfcolor=systemGray",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getrift/rift",
-  "version": "0.1.0-beta.20",
+  "version": "0.1.0-beta.22",
   "description": "Local-first personal memory + reasoning infrastructure with an MCP interface.",
   "homepage": "https://getrift.dev",
   "license": "UNLICENSED",
@@ -14,7 +14,8 @@
   },
   "files": [
     "dist/src",
-    "operator/swiftbar",
+    "operator/swiftbar/rift.10s.sh",
+    "operator/swiftbar/render-menu.py",
     "README.md"
   ],
   "scripts": {
@@ -28,10 +29,11 @@
     "ci:test:focused": "tsx tests/fixtures/generate.ts && vitest tests/retrieval/current-truth.test.ts tests/retrieval/report-demotion.test.ts tests/retrieval/locator-boost.test.ts tests/retrieval/context-pack.test.ts tests/server/routes/search.test.ts tests/server/routes/context.test.ts --run",
     "ci:pr": "npm run ci:typecheck && npm run check:rename && npm run ci:test:focused",
     "check:rename": "bash scripts/check-rename.sh",
+    "check:publish-source": "node scripts/check-publish-source.mjs",
     "check:tarball": "bash scripts/verify-tarball.sh",
     "plist:generate": "bash scripts/generate-plist.sh",
     "postinstall": "node -e \"const e=process.env;if(e.RIFT_SKIP_POSTINSTALL_MENUBAR==='1'||(e.RIFT_POSTINSTALL_MENUBAR!=='1'&&e.npm_config_global!=='true'&&e.npm_config_location!=='global'))process.exit(0);import('./dist/src/cli/postinstall-menubar.js').catch(() => {})\"",
-    "prepublishOnly": "npm run check && npm run check:rename && npm run build && npm run check:tarball"
+    "prepublishOnly": "npm run check:publish-source && npm run check && npm run check:rename && npm run build && npm run check:tarball"
   },
   "dependencies": {
     "@fastify/multipart": "^9.4.0",