@tduyng/pi-cost 0.0.1 → 0.0.3

package/README.md

@@ -1,45 +1,56 @@
 # @tduyng/pi-cost
 
-Cost tracking, rate-limit windows, statusline segments, and per-message timestamps for pi sessions.
+What the session spent, what the provider still allows, and how long each message took. None of it enters the model's context.
 
-## What it does
+## What it costs
 
-### /cost panel
+Zero tokens. No tool, no prompt text, no session entry. The footer segments and the timestamps are display only, and the panels read session files pi already wrote.
 
-Type `/cost` and get a TUI panel with session USD spend, token totals, provider rate-limit bars, and a per-provider token table.
+The point is the bill you cannot see otherwise. A long session's spend is one command away instead of one surprise.
 
-The panel fits the window: its body takes at most 70% of the terminal rows, each line is truncated to the column width instead of wrapping, and the header line shows the range when the rest is scrollable. Up and down move one row, page up and page down move one screen, and Enter or Esc closes it.
+## /cost
 
-An `Extensions` row appears when an extension spent a model call on this session's behalf: a `subagent` child, or the `harness-loop` writer. Those calls bill to the same plan but cannot land in the parent's transcript, so each one appends a line to `<agentDir>/overhead.jsonl` and the panel sums the lines for this session. The row names the cost, the tokens, the call count and each extension's share. The `Cost` row stays what the conversation itself cost, so the two are read side by side and never added twice.
+A TUI panel with session spend in USD, token totals, provider rate-limit bars, and a per-provider token table.
 
-The rate-limit section covers three providers.
-Command Code shows the session 5h window, the weekly window, and remaining credits (monthly plus purchased plus free). Its section paints only when pi holds a Command Code credential in `auth.json`. Without one the probe returns nothing, the section drops, and its cached rows are deleted.
-OpenCode Go shows the rolling window, weekly, and monthly.
-Claude shows the 5h window and the weekly windows (all models, Opus, Sonnet) as percent bars. It reads the Claude Code login on this machine, and its section paints only when that login exists.
+The panel fits the window: body at most 70% of the rows, each line truncated to the column width, and the header shows the range when the rest scrolls. Up and Down move a row, Page Up and Page Down a screen, Enter or Esc closes it.
 
-The token table groups rows by provider (alphabetically) across four trailing windows: 5h, 7d, 30d, and calendar month. Input, output, cache read, and cache write are shown separately, then the total and the cost. A zero column collapses to a dot. Providers with no tokens in any window are omitted. The cost is the `usage.cost.total` each turn recorded in its session file, so it is the API-equivalent price for subscription providers such as `claude`, not a charge.
+An `Extensions` row appears when another extension spent a model call on this session's behalf, such as a `subagent` child or the `harness-loop` writer. Those calls bill to the same plan but cannot land in the parent's transcript, so each appends a line to `<agentDir>/overhead.jsonl` and the panel sums them for this session. The row names the cost, the tokens, the call count, and each extension's share. The `Cost` row stays what the conversation itself cost, so the two are read side by side and never added twice.
 
-### Footer segments
+The token table groups by provider across four trailing windows: 5h, 7d, 30d, and calendar month. Input, output, cache read, and cache write are shown separately, then the total and the cost. A zero column collapses to a dot, and a provider with no tokens in any window is omitted. The cost is the `usage.cost.total` each turn recorded in its session file, so for a subscription provider such as `claude` it is the API-equivalent price rather than a charge.
 
-Three extra segments appear in pi's native footer.
-`tps` shows average output tokens per second across the session.
-`agents` shows the count of running subagent tasks.
-`git` shows changed files and the PR number from `gh pr view`.
+## Rate-limit windows
 
-Session spend and the cache hit rate are left to pi's own footer, which prints both. They were `cost` and `cache` segments here until this version dropped them.
+| Provider | Windows shown |
+| --- | --- |
+| Command Code | session 5h, weekly, remaining credits (monthly plus purchased plus free) |
+| OpenCode Go | rolling, weekly, monthly |
+| Claude | 5h, weekly all models, Opus, Sonnet, as percent bars |
 
-Use `/statusline` to toggle these segments on or off. Use `--statusline-no-pr` to skip the `gh pr view` lookup. The git segment refreshes when a run settles and on a debounced filesystem watcher on `.git/HEAD` (250ms delay), so a branch switch paints at once and an idle session spawns nothing. Worktrees that store `.git` as a file are covered by the settle refresh.
+A section paints only when the credential it needs is on the machine. Without one the probe returns nothing, the section drops, and its cached rows are deleted.
 
-### /timestamps
+## Footer segments
 
-Type `/timestamps` to toggle per-message clock markers in the transcript. Each marker shows the time of day, a relative offset (for example "3m ago"), and whether the message was a user message, AI response, or tool call. Markers are custom session entries, so they never enter model context and the cached prompt prefix stays stable. Two same-role entries within a 2-second window are detected as duplicates (from a double-loaded extension) and suppressed.
+Three extra segments in pi's native footer:
 
-## How it works
+- `tps` is average output tokens per second across the session.
+- `agents` is the count of running subagent tasks.
+- `git` is changed files and the PR number from `gh pr view`.
 
-- Token totals come from scanning session `.jsonl` files. A cache at `<agentDir>/cost-cache.json` stores parsed records keyed by file mtime and size, so repeated `/cost` opens skip unchanged files. Quota data is cached for 24 hours. Files older than the scan window are skipped without a stat call. The cost panel formats amounts under $0.01 with four decimal places, amounts under $1 with three, and amounts at $1 or above with two. Providers `gmi`, `mistral`, `google`, `claude-bridge`, and `commandcode` are excluded from the token table unless `cost.json` names them. A model with no known pricing contributes zero to the total, so the panel understates spend rather than guessing it.
-- Provider quota data is fetched from Command Code's billing/credits endpoint, OpenCode Go's usage endpoint, and Anthropic's OAuth usage endpoint.
-- Nothing enters the model's context. No tool is registered, no prompt text is injected, no session entry is created.
-- The extension adds no segment for session spend or the cache hit rate. It does not track spend across sessions (only the active branch).
+Session spend and cache hit rate are left to pi's own footer, which already prints both.
+
+`/statusline` toggles the segments, and `--statusline-no-pr` skips the `gh pr view` lookup. The git segment refreshes when a run settles and on a debounced watcher on `.git/HEAD` with a 250ms delay, so a branch switch paints at once and an idle session spawns nothing. A worktree that stores `.git` as a file is covered by the settle refresh.
+
+## /timestamps
+
+Toggles per-message clock markers in the transcript: time of day, a relative offset such as `3m ago`, and whether the entry is a user message, an AI response, or a tool call.
+
+Markers are custom session entries, so they never enter model context and the cached prefix stays stable. Two same-role entries within a 2-second window are read as a duplicate from a double-loaded extension and suppressed.
+
+## How it reads the bill
+
+Token totals come from scanning session `.jsonl` files. A cache at `<agentDir>/cost-cache.json` stores parsed records keyed by file mtime and size, so reopening `/cost` skips unchanged files. Quota data is cached 24 hours, and files older than the scan window are skipped without a stat call.
+
+Amounts under $0.01 print with four decimals, under $1 with three, and $1 or more with two. A model with no known pricing contributes zero, so the panel understates spend rather than guessing it.
 
 ## Install
 
@@ -51,11 +62,9 @@ Local checkout: `pi install /path/to/dotfiles/pi/agent/extensions/pi-cost`
 
 ## Configure
 
-Environment variables:
-
-- `OPENCODE_API_KEY`: OpenCode Go API key.
+`OPENCODE_API_KEY` is needed for the OpenCode Go windows.
 
-`<agentDir>/cost.json` controls the token table and the rate-limit sections. It is read each time `/cost` opens, and an invalid file is ignored with a warning. All keys are optional:
+`<agentDir>/cost.json` controls the table and the sections. It is read each time `/cost` opens, and an invalid file is ignored with a warning. Every key is optional:
 
 ```json
 {
@@ -65,6 +74,6 @@ Environment variables:
 }
 ```
 
-- `providers`: the only providers shown in the token table. Omit it to show every provider except the excluded ones above.
-- `cost`: the providers whose cost cell is filled. Omit it to fill the cost for every shown provider. A provider not listed shows a blank cost cell.
-- `limits`: the rate-limit sections to show, by provider id (`commandcode`, `opencode-go`, `claude`). Omit it to show every section that has a credential. A section not listed is not fetched.
+- `providers` lists the providers shown in the token table. Omit it to show every provider except `gmi`, `mistral`, `google`, `claude-bridge`, and `commandcode`, which are hidden unless named.
+- `cost` lists the providers whose cost cell is filled. Omit it to fill every shown provider.
+- `limits` lists the rate-limit sections to fetch by provider id. Omit it to show every section with a credential.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tduyng/pi-cost",
-  "version": "0.0.1",
-  "description": "Session spend, live provider rate-limit windows, footer segments, and per-message timestamps.",
+  "version": "0.0.3",
+  "description": "Session spend, live rate-limit windows, footer segments, and per-message timestamps. Display only, never in the model context.",
   "keywords": [
     "pi",
     "pi-package",

package/src/cost/index.ts

@@ -86,9 +86,12 @@ function errorText(cause: unknown): string {
     return cause instanceof Error ? cause.message : String(cause)
 }
 
-export async function claudeToken(pi: ExtensionAPI): Promise<string | undefined> {
+export async function claudeToken(
+    pi: ExtensionAPI,
+    platform: NodeJS.Platform = process.platform
+): Promise<string | undefined> {
     let raw: string | undefined
-    if (process.platform === 'darwin') {
+    if (platform === 'darwin') {
         const result = await pi.exec('security', ['find-generic-password', '-s', 'Claude Code-credentials', '-w'], {
             cwd: os.homedir(),
             timeout: KEYCHAIN_TIMEOUT_MS
@@ -166,11 +169,18 @@ function modelRates(ctx: ExtensionCommandContext): ModelRates | undefined {
         : undefined
 }
 
-function sessionSpend(ctx: ExtensionCommandContext): SessionSpend {
+function sessionSpend(ctx: ExtensionCommandContext, overheadRecords: ReturnType<typeof readOverhead>): SessionSpend {
     const turns: SessionTurn[] = []
     let costUsd = 0
     let collapsed = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }
-    const rates = modelRates(ctx)
+    const currentRates = modelRates(ctx)
+    const ratesFor = (provider: string, model: string): ModelRates | undefined => {
+        const found = ctx.modelRegistry.find(provider, model)
+        const cost = found?.cost
+        return cost
+            ? { input: cost.input, output: cost.output, cacheRead: cost.cacheRead, cacheWrite: cost.cacheWrite }
+            : undefined
+    }
     for (const entry of ctx.sessionManager.getBranch()) {
         if (entry.type === 'branch_summary') {
             if (entry.usage) {
@@ -181,7 +191,7 @@ function sessionSpend(ctx: ExtensionCommandContext): SessionSpend {
                     cacheRead: collapsed.cacheRead + usage.cacheRead,
                     cacheWrite: collapsed.cacheWrite + usage.cacheWrite
                 }
-                costUsd = addTurnCost(costUsd, usage, rates)
+                costUsd = addTurnCost(costUsd, usage, currentRates)
             }
             continue
         }
@@ -191,7 +201,7 @@ function sessionSpend(ctx: ExtensionCommandContext): SessionSpend {
             continue
         }
         const usage = entry.message.usage
-        costUsd = addTurnCost(costUsd, usage, rates)
+        costUsd = addTurnCost(costUsd, usage, ratesFor(entry.message.provider, entry.message.model) ?? currentRates)
         turns.push({ usage, timestamp: entry.timestamp })
     }
     const totals = sessionTotals(turns)
@@ -199,17 +209,14 @@ function sessionSpend(ctx: ExtensionCommandContext): SessionSpend {
     totals.output += collapsed.output
     totals.cacheRead += collapsed.cacheRead
     totals.cacheWrite += collapsed.cacheWrite
-    const overhead = sumOverhead(readOverhead(getAgentDir(), ctx.sessionManager.getSessionId()))
-    return { costUsd, totals, overhead }
+    return { costUsd, totals, overhead: sumOverhead(overheadRecords) }
 }
 
 function sessionLines(session: SessionSpend, theme: Theme): string[] {
     const label = (text: string) => theme.fg('dim', text.padEnd(LABEL_WIDTH))
     const totals = session.totals
     const hit = formatCacheHit(totals)
-    const extensions = [...session.overhead.byExtension]
-        .map(([name, spend]) => `${name} ${spend.calls}`)
-        .join(', ')
+    const extensions = [...session.overhead.byExtension].map(([name, spend]) => `${name} ${spend.calls}`).join(', ')
     return [
         `  ${label('Cost')}${formatCostUsd(session.costUsd)}`,
         ...(session.overhead.calls === 0
@@ -370,6 +377,7 @@ export default function costExtension(pi: ExtensionAPI): void {
                 container.addChild(border)
 
                 const usage = ctx.getContextUsage()
+                const overheadRecords = readOverhead(getAgentDir(), ctx.sessionManager.getSessionId())
                 const header = [
                     ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined,
                     usage?.percent != null ? `context ${Math.round(usage.percent)}%` : undefined
@@ -387,7 +395,7 @@ export default function costExtension(pi: ExtensionAPI): void {
                 }
 
                 render = () => {
-                    const session = sessionSpend(ctx)
+                    const session = sessionSpend(ctx, overheadRecords)
                     lines = [
                         `${theme.fg('accent', theme.bold('Cost and limits'))}  ${theme.fg('dim', header)}`,
                         '',

package/src/statusline/index.ts

@@ -57,6 +57,7 @@ export default function statuslineExtension(pi: ExtensionAPI): void {
     })
 
     pi.on('agent_settled', () => {
+        if (!enabled) return
         void refreshGit()
     })
 
@@ -73,7 +74,7 @@ export default function statuslineExtension(pi: ExtensionAPI): void {
 
     async function refreshGit(): Promise<void> {
         const ctx = mountedCtx
-        if (!ctx) return
+        if (!ctx || !enabled) return
         try {
             const status = await pi.exec('git', ['status', '--porcelain'], { cwd: ctx.cwd })
             changedFiles = status.stdout.split('\n').filter((line) => line.trim().length > 0).length
@@ -87,7 +88,7 @@ export default function statuslineExtension(pi: ExtensionAPI): void {
 
     async function refreshPr(): Promise<void> {
         const ctx = mountedCtx
-        if (!ctx || !showPr) return
+        if (!ctx || !showPr || !enabled) return
         try {
             const pr = await pi.exec('gh', ['pr', 'view', '--json', 'number', '-q', '.number'], { cwd: ctx.cwd })
             const parsed = Number.parseInt(pr.stdout.trim(), 10)
@@ -122,7 +123,7 @@ export default function statuslineExtension(pi: ExtensionAPI): void {
     }
 
     function mount(ctx: ExtensionContext): void {
-        if (!ctx.hasUI) return
+        if (!ctx.hasUI || !enabled) return
         mountedCtx = ctx
 
         void refreshGit()

package/src/timestamps/logic.ts

@@ -37,8 +37,6 @@ export function isToolCallMessage(message: { stopReason?: string; content?: { ty
     )
 }
 
-const DUPLICATE_WINDOW_MS = 2_000
-
 export function hasDuplicateTimestampEntry(
     entries: readonly unknown[],
     role: 'user' | 'assistant',
@@ -49,7 +47,7 @@ export function hasDuplicateTimestampEntry(
         const entry = entries[i] as { type?: string; customType?: string; data?: TimestampEntryData } | undefined
         if (!entry || entry.type !== 'custom' || entry.customType !== ENTRY_TYPE) continue
         if (!entry.data || entry.data.role !== role) continue
-        if (Math.abs((entry.data.timestamp ?? Number.NaN) - timestamp) <= DUPLICATE_WINDOW_MS) return true
+        if (entry.data.timestamp === timestamp) return true
     }
     return false
 }