@reedchan/statusline 1.7.0 → 1.9.0

package/README.md

@@ -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 per-session state files that survive /reload) sits in that one folder:
 
 ```json
 {

package/README_CN.md

@@ -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,9 @@
  * stepStartTime; decodeMs = completedTime - firstTokenTime; tok/s = usage.output / (decodeMs / 1000)
  */
 
-import { readFile, readdir, writeFile } from 'node:fs/promises'
-import { stat } from 'node:fs/promises'
+import { mkdir, readFile, readdir, rename, stat, unlink, writeFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
-import { join } from 'node:path'
+import { basename, dirname, join } from 'node:path'
 
 import type {
   ExtensionAPI,
@@ -61,13 +60,21 @@ 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(homedir(), '.pi', 'agent', 'statusline-state.json')
+/** One state file per session, so two concurrent sessions cannot clobber each other. */
+const STATE_DIR = join(STATUSLINE_DIR, 'state')
+const LEGACY_STATE = join(homedir(), '.pi', 'agent', 'statusline-state.json')
+/** The 1.8 single-file state: one bucket every session shared, also migrated to per-session. */
+const LEGACY_SHARED_STATE = join(STATUSLINE_DIR, 'state.json')
 const FETCH_TIMEOUT_MS = 5000
 
 function today(): string {
@@ -118,6 +125,50 @@ 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.
+  }
+}
+
+/** Per-session state path: the session file's name is unique and stable across reloads. */
+function statePath(sessionFile: string): string {
+  return join(STATE_DIR, `${basename(sessionFile)}.json`)
+}
+
+/** Moves a shared-bucket state file to its per-session name; garbage in, ignored out. */
+async function migrateLegacyState(legacy: string): Promise<void> {
+  try {
+    const parsed: unknown = JSON.parse(await readFile(legacy, 'utf8'))
+    if (!isRecord(parsed) || typeof parsed.sessionFile !== 'string') return
+    await mkdir(STATE_DIR, { recursive: true })
+    await rename(legacy, statePath(parsed.sessionFile))
+  } catch {
+    // Nothing to migrate, or the file was not ours: leave it alone.
+  }
+}
+
+/** Drops per-session state untouched for a week; older files restore nothing useful. */
+async function pruneState(): Promise<void> {
+  try {
+    const files = await readdir(STATE_DIR)
+    const cutoff = Date.now() - 7 * 24 * 60 * 60 * 1000
+    await Promise.all(
+      files.map(async (name) => {
+        const filePath = join(STATE_DIR, name)
+        const stats = await stat(filePath).catch(() => null)
+        if (stats !== null && stats.mtimeMs < cutoff) await unlink(filePath).catch(() => {})
+      }),
+    )
+  } catch {
+    // No state dir yet: nothing to prune.
+  }
+}
+
 /** 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
@@ -191,6 +242,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]
@@ -337,6 +390,12 @@ export default function (pi: ExtensionAPI) {
   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
@@ -391,19 +450,21 @@ export default function (pi: ExtensionAPI) {
       ttftCount,
       last: reading,
     }
-    void writeFile(STATE_PATH, `${JSON.stringify(state, null, 2)}\n`).catch(() => {})
+    void mkdir(STATE_DIR, { recursive: true })
+      .then(() => writeFile(statePath(sessionFile), `${JSON.stringify(state, null, 2)}\n`))
+      .catch(() => {})
   }
 
-  /** Restores what persist wrote, but only for this exact session file. */
+  /** Restores this session's own state file, written by persist before the reload. */
   async function restore(sessionFile: string | null): Promise<void> {
     if (sessionFile === null) return
     let state: unknown
     try {
-      state = JSON.parse(await readFile(STATE_PATH, 'utf8'))
+      state = JSON.parse(await readFile(statePath(sessionFile), 'utf8'))
     } catch {
       return
     }
-    if (!isRecord(state) || state.sessionFile !== sessionFile) return
+    if (!isRecord(state)) return
     totalDecodeMs = num(state.totalDecodeMs)
     totalMeasuredOutput = num(state.totalMeasuredOutput)
     totalTtftMs = num(state.totalTtftMs)
@@ -428,15 +489,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,
@@ -547,6 +615,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 migrateLegacyState(LEGACY_STATE)
+    await migrateLegacyState(LEGACY_SHARED_STATE)
+    void pruneState()
     const file = ctx.sessionManager.getSessionFile()
     await restore(file ?? null)
     todayBase = await sumOtherTodaysCost(file ?? null, startOfToday())

package/extensions/statusline/render.ts

@@ -429,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 =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reedchan/statusline",
-  "version": "1.7.0",
+  "version": "1.9.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",