@reedchan/statusline 1.6.0 → 1.8.0

package/README.md

@@ -8,8 +8,8 @@ Replaces pi's footer with a labelled two-row one. Every value carries a word, so
 decoded from a symbol or remembered from a legend.
 
 ```
-Context  █████████▍░░░░░░░░░░  47%   471k / 1.0M     Input 194k  ·  Output 89k  ·  Cache hit 99.9%  ·  Cost $0.229  ·  Today $1.63
-~/.pi (master)                                                               deepseek-flash · Effort high · TTFT 482ms · 729 tok/s
+Context  █████████▍░░░░░░░░░░  47%   471k / 1.0M     Input 194k  ·  Output 89k  |  Cache hit 99.9%  |  Cost $0.229  ·  Today $1.63
+~/.pi (master)                         deepseek-flash · Effort high | TTFT 482ms · Avg TTFT 612ms | Last 729 tok/s · Avg 512 tok/s
 LSP Active: typescript
 ```
 
@@ -54,7 +54,8 @@ Configuration lives at the top of [`render.ts`](render.ts):
 ## Currency
 
 pi prices every model in USD and its `cost` field carries no unit at all, so the footer cannot know
-what you were actually billed. The currency and the rate live in `~/.pi/agent/statusline.json`:
+what you were actually billed. The currency and the rate live in `~/.pi/agent/statusline/config.json` — everything this
+extension keeps (config plus the reload-proof state file) sits in that one folder:
 
 ```json
 {

package/README_CN.md

@@ -7,8 +7,8 @@
 替换 pi 的 footer，改成带文字标签的两行。每个值都带一个词，不需要靠符号猜、也不需要记图例。
 
 ```
-Context  █████████▍░░░░░░░░░░  47%   471k / 1.0M     Input 194k  ·  Output 89k  ·  Cache hit 99.9%  ·  Cost $0.229  ·  Today $1.63
-~/.pi (master)                                                               deepseek-flash · Effort high · TTFT 482ms · 729 tok/s
+Context  █████████▍░░░░░░░░░░  47%   471k / 1.0M     Input 194k  ·  Output 89k  |  Cache hit 99.9%  |  Cost $0.229  ·  Today $1.63
+~/.pi (master)                         deepseek-flash · Effort high | TTFT 482ms · Avg TTFT 612ms | Last 729 tok/s · Avg 512 tok/s
 LSP Active: typescript
 ```
 
@@ -52,7 +52,7 @@ LSP Active: typescript
 ## 币种
 
 pi 里所有模型价格都是美元，而且它的 `cost` 字段**不带任何单位**，所以 footer 无从知道你实际是按什么币种付的。
-币种与汇率放在 `~/.pi/agent/statusline.json`：
+币种与汇率放在 `~/.pi/agent/statusline/config.json`——本扩展的所有文件（配置加状态）都集中在这个文件夹里：
 
 ```json
 {

package/extensions/statusline/index.ts

@@ -18,10 +18,10 @@
  * stepStartTime; decodeMs = completedTime - firstTokenTime; tok/s = usage.output / (decodeMs / 1000)
  */
 
-import { readFile, readdir, writeFile } from 'node:fs/promises'
+import { mkdir, readFile, readdir, rename, writeFile } from 'node:fs/promises'
 import { stat } from 'node:fs/promises'
 import { homedir } from 'node:os'
-import { join } from 'node:path'
+import { dirname, join } from 'node:path'
 
 import type {
   ExtensionAPI,
@@ -37,6 +37,7 @@ import {
   formatCwd,
   formatLatency,
   formatTps,
+  avgMs,
   isQuietStatus,
   pair,
   cachedRates,
@@ -60,11 +61,18 @@ const TICK_MS = 250
 const FALLBACK_TOKENS_PER_CHAR = 0.25
 
 /** The status line's own settings file, alongside pi's other per-tool config. */
-const CONFIG_PATH = join(homedir(), '.pi', 'agent', 'statusline.json')
+/** Everything this extension keeps lives in one folder, not loose files relying on name prefixes. */
+const STATUSLINE_DIR = join(homedir(), '.pi', 'agent', 'statusline')
+const CONFIG_PATH = join(STATUSLINE_DIR, 'config.json')
+/** Pre-1.8 locations, migrated out of on first start. */
+const LEGACY_CONFIG = join(homedir(), '.pi', 'agent', 'statusline.json')
 /** Free, keyless, and one request returns every currency — so the cache serves instant switching. */
 const RATES_URL = 'https://open.er-api.com/v6/latest/USD'
 /** Every session on this machine, for the day-cost total that spans projects and models. */
 const SESSIONS_DIR = join(homedir(), '.pi', 'agent', 'sessions')
+/** Where throughput metrics wait out a /reload: keyed by session file, so a reload restores. */
+const STATE_PATH = join(STATUSLINE_DIR, 'state.json')
+const LEGACY_STATE = join(homedir(), '.pi', 'agent', 'statusline-state.json')
 const FETCH_TIMEOUT_MS = 5000
 
 function today(): string {
@@ -110,6 +118,21 @@ function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === 'object' && value !== null && !Array.isArray(value)
 }
 
+/** Coerces a persisted counter back to a non-negative finite number, or 0. */
+function num(value: unknown): number {
+  return typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : 0
+}
+
+/** Moves a pre-1.8 flat file into the extension folder; missing files are the normal case. */
+async function migrateLegacyFile(legacy: string, current: string): Promise<void> {
+  try {
+    await mkdir(dirname(current), { recursive: true })
+    await rename(legacy, current)
+  } catch {
+    // Nothing at the old path, or already migrated: either way the current file rules.
+  }
+}
+
 /** Today's provider cost of one session-file line, or null when the line bills nothing today. */
 function entryCost(line: string, since: number): number | null {
   if (!line.includes('"usage"')) return null
@@ -183,6 +206,8 @@ async function loadCurrency(notify: (message: string) => void): Promise<Currency
   const { currency, pending, problem } = currencyFromConfig(text)
   if (problem !== null) notify(problem)
   if (pending === null) return currency
+  // Costs are already USD; a rates fetch could only ever return 1.
+  if (pending.code === 'USD') return USD
 
   const cached = cachedRates(text)
   const known = cached?.rates[pending.code]
@@ -326,7 +351,15 @@ export default function (pi: ExtensionAPI) {
   let firstTokenAt: number | null = null
   let totalDecodeMs = 0
   let totalMeasuredOutput = 0
+  let totalTtftMs = 0
+  let ttftCount = 0
   let todayBase = 0
+  /** Last context usage pi reported with real numbers, shown when pi's current answer is stale. */
+  let lastKnownUsage: {
+    tokens: number | null
+    percent: number | null
+    contextWindow: number
+  } | null = null
   let ticker: ReturnType<typeof setInterval> | null = null
   let windowAt = 0
   let windowTokens = 0
@@ -365,6 +398,48 @@ export default function (pi: ExtensionAPI) {
     }, TICK_MS)
   }
 
+  /**
+   * Writes the throughput metrics so a /reload can restore them.
+   *
+   * Decode timing only exists in live stream events — pi records nothing per message — so without
+   * this file the session's averages reset to zero every time the extension re-loads.
+   */
+  function persist(sessionFile: string | null): void {
+    if (sessionFile === null) return
+    const state = {
+      sessionFile,
+      totalDecodeMs,
+      totalMeasuredOutput,
+      totalTtftMs,
+      ttftCount,
+      last: reading,
+    }
+    void writeFile(STATE_PATH, `${JSON.stringify(state, null, 2)}\n`).catch(() => {})
+  }
+
+  /** Restores what persist wrote, but only for this exact session file. */
+  async function restore(sessionFile: string | null): Promise<void> {
+    if (sessionFile === null) return
+    let state: unknown
+    try {
+      state = JSON.parse(await readFile(STATE_PATH, 'utf8'))
+    } catch {
+      return
+    }
+    if (!isRecord(state) || state.sessionFile !== sessionFile) return
+    totalDecodeMs = num(state.totalDecodeMs)
+    totalMeasuredOutput = num(state.totalMeasuredOutput)
+    totalTtftMs = num(state.totalTtftMs)
+    ttftCount = num(state.ttftCount)
+    if (isRecord(state.last) && typeof state.last.rate === 'number') {
+      reading = {
+        rate: state.last.rate,
+        exact: state.last.exact === true,
+        ttftMs: typeof state.last.ttftMs === 'number' ? state.last.ttftMs : null,
+      }
+    }
+  }
+
   function installFooter(ctx: ExtensionContext): void {
     ctx.ui.setFooter((tui, theme, footerData: ReadonlyFooterDataProvider) => {
       requestRender = () => tui.requestRender()
@@ -376,15 +451,22 @@ export default function (pi: ExtensionAPI) {
         },
         render(width: number): string[] {
           const usage = ctx.getContextUsage()
+          // pi nulls tokens and percent when the last usage predates a compaction and no response
+          // has landed since: the numbers it could hand over are stale, not zero. Show the last
+          // reading we trusted instead; a brand-new session starts at 0, which is near the truth.
+          const trusted =
+            usage !== undefined && usage.tokens !== null && usage.percent !== null ? usage : null
+          if (trusted !== null) lastKnownUsage = trusted
+          const shown = trusted ?? lastKnownUsage
           const totals = collectTotals(ctx, startOfToday())
           const avg = avgTokPerSec(totalMeasuredOutput, totalDecodeMs)
           const row1 = contextRow(
             theme,
             width,
             {
-              percent: usage?.percent ?? null,
-              tokens: usage?.tokens ?? 0,
-              window: usage?.contextWindow ?? ctx.model?.contextWindow ?? 0,
+              percent: shown?.percent ?? 0,
+              tokens: shown?.tokens ?? 0,
+              window: usage?.contextWindow ?? shown?.contextWindow ?? ctx.model?.contextWindow ?? 0,
               input: totals.input,
               output: totals.output,
               cacheHitRate: totals.cacheHitRate,
@@ -394,19 +476,31 @@ export default function (pi: ExtensionAPI) {
             currency,
           )
 
-          // Row 2: model and the latest turn's timing on the right, path on the left.
+          // Row 2: model and the latest turn's timing on the right, path on the left. Three
+          // groups — identity, first token, throughput — separated by a wall instead of another
+          // dot, because a run of similar-looking pairs is what made the old footer unreadable.
           const model = ctx.model?.id ?? 'no model'
-          const row2Parts = [theme.fg('accent', model)]
-          if (ctx.thinkingLevel) row2Parts.push(pair(theme, 'Effort', ctx.thinkingLevel, 'muted'))
+          const separator = theme.fg('dim', '  ·  ')
+          const wall = theme.fg('dim', '  |  ')
+          const identity = [theme.fg('accent', model)]
+          if (ctx.thinkingLevel) identity.push(pair(theme, 'Effort', ctx.thinkingLevel, 'muted'))
+
+          const ttft: string[] = []
           const waiting = ttftDisplay(requestAt, firstTokenAt, Date.now())
           if (waiting !== null) {
             // The clock is running: this wait has no reading yet, so the previous turn's
-            // throughput would only be mistaken for the current one.
-            row2Parts.push(pair(theme, 'TTFT', waiting.text, 'muted'))
+            // numbers would only be mistaken for the current one.
+            ttft.push(pair(theme, 'TTFT', waiting.text, 'muted'))
           } else if (reading) {
             if (reading.ttftMs !== null)
-              row2Parts.push(pair(theme, 'TTFT', formatLatency(reading.ttftMs), 'muted'))
-            row2Parts.push(
+              ttft.push(pair(theme, 'TTFT', formatLatency(reading.ttftMs), 'muted'))
+          }
+          const avgTtft = avgMs(totalTtftMs, ttftCount)
+          if (avgTtft !== null) ttft.push(pair(theme, 'Avg TTFT', formatLatency(avgTtft), 'muted'))
+
+          const throughput: string[] = []
+          if (reading) {
+            throughput.push(
               pair(
                 theme,
                 'Last',
@@ -415,9 +509,12 @@ export default function (pi: ExtensionAPI) {
               ),
             )
           }
-          if (avg !== null) row2Parts.push(pair(theme, 'Avg', `${formatTps(avg)} tok/s`, 'muted'))
-          const row2Right = row2Parts.join(theme.fg('dim', '  ·  '))
+          if (avg !== null) throughput.push(pair(theme, 'Avg', `${formatTps(avg)} tok/s`, 'muted'))
 
+          const row2Right = [identity, ttft, throughput]
+            .filter((group) => group.length > 0)
+            .map((group) => group.join(separator))
+            .join(wall)
           const branch = footerData.getGitBranch()
           const path = formatCwd(ctx.cwd)
           const branchSuffix = branch ? ` (${branch})` : ''
@@ -480,7 +577,11 @@ export default function (pi: ExtensionAPI) {
     stopTicker()
     resetStream()
     currency = await loadCurrency((message) => ctx.ui.notify(message, 'warning'))
+    lastKnownUsage = null
+    await migrateLegacyFile(LEGACY_CONFIG, CONFIG_PATH)
+    await migrateLegacyFile(LEGACY_STATE, STATE_PATH)
     const file = ctx.sessionManager.getSessionFile()
+    await restore(file ?? null)
     todayBase = await sumOtherTodaysCost(file ?? null, startOfToday())
     installFooter(ctx)
   })
@@ -546,7 +647,7 @@ export default function (pi: ExtensionAPI) {
     publish(rate, false, ttftMs(requestAt, firstTokenAt))
   })
 
-  pi.on('message_end', async (event) => {
+  pi.on('message_end', async (event, ctx) => {
     if (event.message.role !== 'assistant') return
 
     const message = event.message as { content: unknown; usage?: { output?: number } }
@@ -566,6 +667,9 @@ export default function (pi: ExtensionAPI) {
       // below once produced an Avg of 4324 tok/s.
       totalDecodeMs += decodeMs
       if (output > 0) totalMeasuredOutput += output
+      totalTtftMs += measured
+      ttftCount += 1
+      persist(ctx.sessionManager.getSessionFile() ?? null)
       publish((tokens / decodeMs) * 1000, output > 0, measured)
     }
     // Null it with the stream: a request that has produced its message is no longer in flight, and

package/extensions/statusline/render.ts

@@ -296,6 +296,11 @@ export function avgTokPerSec(outputTokens: number, decodeMs: number): number | n
   return outputTokens / (decodeMs / 1000)
 }
 
+/** Mean of `count` durations totalling `totalMs`; null when nothing was measured. */
+export function avgMs(totalMs: number, count: number): number | null {
+  return count > 0 ? totalMs / count : null
+}
+
 /**
  * The config file's text with the day's rates recorded in it, so the next session starts warm.
  *
@@ -424,7 +429,7 @@ export function contextRow(
   const percent = theme.fg(
     percentColor(parts.percent),
     // Whole percents: the meter carries the precision, and a decimal here is noise.
-    parts.percent === null ? '?' : `${Math.round(parts.percent)}%`,
+    parts.percent === null ? '--' : `${Math.round(parts.percent)}%`,
   )
   const meter = `${theme.fg('dim', 'Context')}  ${bar(theme, BAR_CELLS, fraction)}  ${percent}`
   const detail =
@@ -435,18 +440,28 @@ export function contextRow(
   const volumes: string[] = []
   if (parts.input > 0) volumes.push(pair(theme, 'Input', formatTokens(parts.input)))
   if (parts.output > 0) volumes.push(pair(theme, 'Output', formatTokens(parts.output)))
-  const outcomes: string[] = []
+  const hit: string[] = []
   if (parts.cacheHitRate !== null) {
-    outcomes.push(pair(theme, 'Cache hit', `${parts.cacheHitRate.toFixed(1)}%`))
+    hit.push(pair(theme, 'Cache hit', `${parts.cacheHitRate.toFixed(1)}%`))
   }
-  if (parts.cost > 0) outcomes.push(pair(theme, 'Cost', formatCost(parts.cost, currency)))
+  const money: string[] = []
+  if (parts.cost > 0) money.push(pair(theme, 'Cost', formatCost(parts.cost, currency)))
   if (parts.todayCost > 0) {
-    outcomes.push(pair(theme, 'Today', formatCost(parts.todayCost, currency)))
+    money.push(pair(theme, 'Today', formatCost(parts.todayCost, currency)))
   }
 
   const separator = theme.fg('dim', '  ·  ')
-  const full = [...volumes, ...outcomes].join(separator)
-  const core = outcomes.join(separator)
+  // Groups, not a flat run of dots: volumes | cache | money. A wall between different kinds of
+  // number reads faster than another dot between similar-looking ones.
+  const groups: string[] = []
+  if (volumes.length > 0) groups.push(volumes.join(separator))
+  if (hit.length > 0) groups.push(hit.join(separator))
+  if (money.length > 0) groups.push(money.join(separator))
+  const full = groups.join(theme.fg('dim', '  |  '))
+  const core =
+    hit.length > 0 && money.length > 0
+      ? hit.join(separator) + theme.fg('dim', '  |  ') + money.join(separator)
+      : [...hit, ...money].join(separator)
   const fits = (left: string, right: string): boolean =>
     right === '' || visibleWidth(left) + 2 + visibleWidth(right) <= width
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reedchan/statusline",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "Replaces pi's footer with a labelled two-row status line: context pressure as a fixed-size meter, cache and cost, the model and effort level, and the latest turn's TTFT and decode throughput in tokens/second.",
   "keywords": [
     "bun",