sprag-cli 3.48.0 → 3.49.0

package/bin/cli.js

@@ -34,6 +34,7 @@ import {
   readStdinJson,
   extractCaps,
   extractContextUsage,
+  extractEffort,
   extractModel,
 } from '../src/stdin-payload.js';
 
@@ -514,6 +515,7 @@ async function main() {
       const stdinJson = readStdinJson();
       const caps = extractCaps(stdinJson);
       const model = extractModel(stdinJson);
+      const effort = extractEffort(stdinJson);
       if (caps || model) {
         try {
           const { persistSnapshot } = await import('../src/caps-cache.js');
@@ -521,7 +523,7 @@ async function main() {
         } catch (e) { debug('caps-cache:persist', e); }
       }
       console.log(formatNoSession(
-        { caps, model, windowLabel, version: PKG_VERSION, update: readUpdateChip() },
+        { caps, model, effort, windowLabel, version: PKG_VERSION, update: readUpdateChip() },
         { color: colorOk, mode: labelMode },
       ));
       return;
@@ -567,6 +569,11 @@ async function main() {
   const stdinJson = readStdinJson();
   let caps = extractCaps(stdinJson);
   let model = extractModel(stdinJson);
+  // Not persisted to the caps cache the way caps/model are: the cache exists so
+  // the table view (which pipes no stdin) can still show them, and a level the
+  // user has since changed would be worse there than no chip at all. The effort
+  // chip is a live-statusline reading only.
+  const effort = extractEffort(stdinJson);
   const ctxLive = extractContextUsage(stdinJson);
   if (isStatusline && (caps || model)) {
     try {
@@ -758,6 +765,7 @@ async function main() {
     spikeChip,
     caps,
     model,
+    effort,
     delegationSaved,
     delegationTotals,
     doc2mdTotals,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sprag-cli",
-  "version": "3.48.0",
+  "version": "3.49.0",
   "description": "Sprag - a quality ratchet harness for AI coding agents: model-fitting delegation, ratchet rules, doc2md, Korean style gate. Same tool as claude-token-saver, under its new name.",
   "type": "module",
   "bin": {

package/src/formatters/statusline.js

@@ -208,6 +208,54 @@ function buildKoreanSeg(c, isIcon, verbose, g) {
   }
 }
 
+/**
+ * Effort tones. Claude Code resolves an unset effort to `high`, so `high` is the
+ * level a session runs at when nobody has touched it — it gets the magenta
+ * identity tone the model chip uses, and the two chips read as one group about
+ * which model is answering and how hard. Levels below default recede to gray:
+ * they spend less, and this tool has no business nagging about that.
+ *
+ * The levels above default are the same magenta, bold. Not yellow, although
+ * raising effort does buy quality with tokens per turn: yellow in this line is
+ * the "you should do something eventually" tone (see buildVersionSeg), and an
+ * effort level is a setting the user chose, not a state to fix. Someone who
+ * pins `max` would read a permanently yellow chip as a standing complaint, and
+ * a chip that is always warning-colored is how a line teaches the eye to skip
+ * its warning color. Bold says "turned up" in the identity tone instead.
+ *
+ * An unlisted level (a new one Anthropic ships) renders in the identity tone
+ * rather than not at all.
+ */
+const EFFORT_TONES = {
+  none: GRAY,
+  low: GRAY,
+  medium: GRAY,
+  high: MAGENTA,
+  xhigh: BOLD + MAGENTA,
+  max: BOLD + MAGENTA,
+};
+
+/**
+ * Effort chip builder — the level from Claude Code's stdin payload
+ * (`effort.level`, see extractEffort).
+ *
+ * The level is a word ("high"), so icon modes need no label beside the glyph:
+ * `🔬 high` already reads. Text mode names the field, because a bare "high"
+ * next to a model name would be anyone's guess.
+ */
+function buildEffortSeg(effort, c, isIcon, g) {
+  if (typeof effort !== 'string' || effort.length === 0) return null;
+  // `hasOwn` rather than a bare index, for the reason model-alias.js gives at
+  // its own lookup: the level is a string off a JSON payload, and a level of
+  // 'constructor' or '__proto__' would resolve through Object.prototype to a
+  // function or an object. The `|| MAGENTA` fallback cannot catch that, since
+  // both are truthy — the tone would be interpolated as
+  // `function Object() { [native code] }` and take the whole line with it.
+  const tone = Object.hasOwn(EFFORT_TONES, effort) ? EFFORT_TONES[effort] : MAGENTA;
+  if (isIcon) return `${c(tone)}${g.effort} ${effort}${c(RESET)}`;
+  return `${c(tone)}Effort ${effort}${c(RESET)}`;
+}
+
 /**
  * Version segment builder — "which copy of this tool am I looking at", plus
  * the upgrade nudge when a newer one has been published.
@@ -289,9 +337,10 @@ function buildCapWarnSeg(capWarn, c, isIcon, g, color, mode) {
  * The stdin payload (rate limits, model) is still live in that case, and a
  * 90%+ cap warning is exactly the kind of signal that must not disappear
  * just because the user has been idle past the window — so cap-warn,
- * harness, and model chips still render around the "no session data" note.
+ * harness, model, and effort chips still render around the "no session data"
+ * note.
  */
-export function formatNoSession({ caps = null, model = null, windowLabel = '', version = '', update = null } = {}, { color = true, mode = 'icon' } = {}) {
+export function formatNoSession({ caps = null, model = null, effort = null, windowLabel = '', version = '', update = null } = {}, { color = true, mode = 'icon' } = {}) {
   const c = (v) => (color ? v : '');
   // narrow shares the icon layout and swaps only the glyphs, so both modes take
   // the same branches from here on.
@@ -307,6 +356,8 @@ export function formatNoSession({ caps = null, model = null, windowLabel = '', v
   if (typeof model === 'string' && model.length > 0) {
     segs.push(isIcon ? `${c(MAGENTA)}${g.model} ${model}${c(RESET)}` : `${c(MAGENTA)}${model}${c(RESET)}`);
   }
+  const effortSeg = buildEffortSeg(effort, c, isIcon, g);
+  if (effortSeg) segs.push(effortSeg);
   segs.push(`${c(GRAY)}${g.hit} no session data${windowLabel ? ` · ${windowLabel}` : ''}${c(RESET)}`);
   if (versionSeg && !(update && update.available)) segs.push(versionSeg);
   return segs.join(' · ') + (color ? '\x1b[K' : '');
@@ -319,7 +370,7 @@ export function formatNoSession({ caps = null, model = null, windowLabel = '', v
  * @param {boolean} [opts.verbose=false] - longer layout with labels
  * @param {boolean} [opts.timer=true] - show TTL countdown segment
  * @param {'text'|'icon'} [opts.mode='text'] - label style. 'icon' uses 🧠 ⏳ 💰 instead of word labels.
- * @param {string[]|null} [opts.segments] - segments to render, in the order given. Names: cap-warn, spike, version, harness, korean, model, hit, ttl, month, saved, delegated, doc2md, ctx, period, `usage` (every rate-limit window), plus per-window keys (`five_hour`, `seven_day`, …). `5h`/`7d` are kept as aliases for back-compat. cap-warn and spike keep the lead regardless of where they appear. Null/undefined = all, in the default order.
+ * @param {string[]|null} [opts.segments] - segments to render, in the order given. Names: cap-warn, spike, version, harness, korean, model, effort, hit, ttl, month, saved, delegated, doc2md, ctx, period, `usage` (every rate-limit window), plus per-window keys (`five_hour`, `seven_day`, …). `5h`/`7d` are kept as aliases for back-compat. cap-warn and spike keep the lead regardless of where they appear. Null/undefined = all, in the default order.
  * @param {boolean} [opts.singleLine=false] - force the legacy one-line layout. By default, when the delegation ledger has lifetime savings, the routing totals lead on their own first line and everything else moves to line 2 (Claude Code renders multi-line statuslines; `--single-line` is the escape hatch for terminals that only show the first line).
  */
 /**
@@ -341,7 +392,7 @@ export const DEFAULT_SEGMENT_ORDER = [
   'cap-warn', 'spike',
   'usage', 'ctx',
   'ttl',
-  'model',
+  'model', 'effort',
   // Grouped by the timeframe each figure covers, because mixing them was the
   // problem: a lifetime total, a windowed rate and a calendar-month estimate sat
   // interleaved, with one window label at the end of the line that appeared to
@@ -359,7 +410,7 @@ export const DEFAULT_SEGMENT_ORDER = [
 ];
 
 export function formatReport(data, { color = true, verbose = false, timer = true, mode = 'text', segments = null, singleLine = false } = {}) {
-  const { summary, ttl, cost, options, lastActivity, contextWindow, ctxLive, spikeChip, caps, model } = data;
+  const { summary, ttl, cost, options, lastActivity, contextWindow, ctxLive, spikeChip, caps, model, effort } = data;
   const { hitRate } = summary;
 
   // Hit rate → color signal
@@ -711,6 +762,11 @@ export function formatReport(data, { color = true, verbose = false, timer = true
     }
   }
 
+  // Effort chip — how hard the session is being worked (`/effort`). It follows
+  // the model chip because it qualifies it: the same model answers differently
+  // at `low` and at `max`, and the pair is one glance.
+  const effortSeg = buildEffortSeg(effort, c, isIcon, g);
+
   // Always-on usage segments — what /usage shows in Claude Code, mirrored
   // to the statusline so the user doesn't have to slash-command for it.
   // Today the stdin payload exposes the 5h ("Current session") and 7-day
@@ -820,6 +876,7 @@ export function formatReport(data, { color = true, verbose = false, timer = true
       case 'harness':   return [harnessSeg];
       case 'korean':    return [koreanSeg];
       case 'model':     return [modelSeg];
+      case 'effort':    return [effortSeg];
       // Dropped when the same story already owns a headline line above, which
       // would otherwise repeat it on line 2.
       case 'delegated': return totalsLine ? [] : [delegateSeg];

package/src/glyphs.js

@@ -39,6 +39,13 @@ const ICON = {
   harness: '🅷',
   korean: '✍️',
   model: '🤖',
+  // Effort: a closer look at the same thing, which is what raising it buys.
+  // Width decided this as much as meaning. The obvious picks for "a level" are
+  // 🎚 and 🎛 (U+1F39A/1F39B), and both are East Asian Width N while every other
+  // glyph in this set is W — drawn from the color-emoji font they occupy two
+  // cells while being counted as one, and the line shifts on every repaint. 🔬
+  // is W, so it measures the same as its neighbours.
+  effort: '🔬',
   routing: '🔀',
   doc: '📄',
   hit: '🧠',
@@ -67,6 +74,7 @@ const NARROW = {
   harness: '⍟',   // circled star: a score out of five
   korean: '⌨',    // an input/typing convention rather than a hand
   model: '◈',
+  effort: '▲',    // a magnitude: how hard the turn is being worked
   routing: '⇉',   // sent down a different path
   doc: '≣',       // stacked lines: a page of text
   hit: '◉',       // bullseye: a cache hit

package/src/stdin-payload.js

@@ -14,6 +14,7 @@ import { readFileSync } from 'node:fs';
  * The blob shape (subset we consume):
  *   {
  *     "transcript_path": "...",
+ *     "effort": { "level": "high" },
  *     "rate_limits": {
  *       "five_hour":  { "used_percentage": 94, "resets_at": 1777099200 },
  *       "seven_day":  { "used_percentage": 7,  "resets_at": 1777521600 }
@@ -120,3 +121,29 @@ export function extractModel(stdinJson) {
   if (typeof m.id === 'string' && m.id) return m.id;
   return null;
 }
+
+/**
+ * The effort level the session is running at — what `/effort` sets.
+ *
+ * Claude Code 2.1.276 assembles the statusline payload with
+ * `...modelHasEffort(model) && { effort: { level: resolved } }`, so two facts
+ * follow. The level arrives already resolved against the session setting (the
+ * builder defaults it to `high` when nothing is set), which is why no default
+ * is applied here. And the key is dropped entirely for models that carry no
+ * effort setting at all (the claude-3 era, opus-4.0, opus-4.1), as it is on
+ * Claude Code builds older than the field itself — so a null means "nothing to
+ * show", never "something went wrong", and the chip simply does not render.
+ *
+ * A per-turn override (the transcript's `perTurnEffort`) is not visible here:
+ * the builder resolves the level without passing the per-turn argument, so what
+ * this returns is the session level even on a turn that ran at another one.
+ *
+ * Lowercased so the renderer can look a tone up by level; an unrecognised level
+ * still renders, just in the default tone.
+ */
+export function extractEffort(stdinJson) {
+  const level = stdinJson?.effort?.level;
+  if (typeof level !== 'string') return null;
+  const trimmed = level.trim();
+  return trimmed === '' ? null : trimmed.toLowerCase();
+}