opencode-tweaks 0.6.0 → 0.6.1

package/README.md

@@ -179,11 +179,12 @@ Costs come from what the provider reports, so a free plan shows `$0.00`. `Cost d
 `Auto` keeps two decimals and grows until the first significant digit shows (`$0.004`), while a fixed choice always
 keeps that many (`$0.0042`).
 
-`Price windows` marks the provider's higher rate beside the cost. DeepSeek doubles its listed prices from 01:00 to
+`Price windows` marks rounds billed above the catalog price. DeepSeek doubles its listed prices from 01:00 to
 04:00 and from 06:00 to 10:00 UTC, Monday to Friday, and bills Chinese public holidays at the off-peak rate; OpenCode
-Go publishes the same DeepSeek rates. The badge reads `peak ×2` while that rate applies. The catalog already holds the
-off-peak price, so the figures themselves stay the listed rate. The 2026 and 2027 holidays are built in; update
-`src/usage/price-window.ts` when the next calendar is published.
+Go publishes the same DeepSeek rates. The badge reads `peak ×2` beside the turn cost when that round started in a peak
+window, so it stays on screen after the window closes. The catalog already holds the off-peak price, so the figures
+themselves stay the listed rate. The 2026 and 2027 holidays are built in; update `src/usage/price-window.ts` when the
+next calendar is published.
 
 `Estimate cost` fills in a price the provider did not report, using the model's list price from the same catalog
 OpenCode already synced: prompt, completion, reasoning billed as output, and cache traffic, each at its own rate. A

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode-tweaks",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Opt-in settings and small interface improvements for OpenCode.",
   "type": "module",
   "license": "MIT",

package/src/tweaks/cost.ts

@@ -60,8 +60,7 @@ export const costTweak = defineTweak({
     {
       id: "windows",
       title: "Price windows",
-      description:
-        "Mark when the provider charges more than the catalog price, such as DeepSeek peak hours.",
+      description: "Mark rounds billed above the catalog price, such as DeepSeek peak hours.",
       category: "Display",
       kind: "boolean",
       default: true,

package/src/tweaks/usage-slots.tsx

@@ -10,7 +10,7 @@ import {
   priceFor,
 } from "../usage/cost"
 import { footerMessage, replyTurnMessages, type UsageMessage } from "../usage/messages"
-import { formatPriceWindow, type PriceModel, priceWindowFor } from "../usage/price-window"
+import { formatPriceWindow, type PriceModel, turnPriceWindow } from "../usage/price-window"
 import { formatTokens, sessionTokens, type TokenCount, usageTokens } from "../usage/tokens"
 import { costTweak } from "./cost"
 import type { SettingsStore } from "./settings"
@@ -84,19 +84,6 @@ function useUsage(props: {
 
   const sessions = props.context.data.session
 
-  const [now, setNow] = createSignal(Date.now())
-
-  // The badge follows the clock, not the transcript: a line that stays on
-  // screen across a rate change has to update on its own. The timer exists
-  // only while the cost tweak and its price windows are on.
-  createEffect(() => {
-    if (!costOn() || !windowsOn() || (!promptCost() && !totalCost())) return
-
-    setNow(Date.now())
-    const timer = setInterval(() => setNow(Date.now()), 30_000)
-    onCleanup(() => clearInterval(timer))
-  })
-
   // List prices come from the model catalog the TUI already synced, so an
   // estimate costs nothing but a lookup.
   const prices = createMemo(() => {
@@ -205,27 +192,17 @@ function useUsage(props: {
     return sessions.get(sessionID)?.model ?? lastModel(messages(sessionID))
   }
 
-  /** The higher price that applies right now, when the cost figures are on. */
-  const windowFor = (model: PriceModel | undefined) =>
-    costOn() && windowsOn() ? priceWindowFor(model, new Date(now())) : undefined
-
   const promptCostLabel = () => {
     const value = cost()
     if (!costOn() || !promptCost() || value === undefined) return undefined
 
     const label = formatCost(value, costDigits())
-    const window = windowFor(lastModel(turn()) ?? sessionModel())
+    const window = windowsOn() ? turnPriceWindow(turn(), sessionModel()) : undefined
     return window ? `${label} · ${formatPriceWindow(window)}` : label
   }
 
-  const totalCostLabel = () => {
-    if (!costOn() || !totalCost()) return undefined
-
-    const value = sessionCost()
-    const label = formatCost(value, costDigits())
-    const window = value > 0 ? windowFor(sessionModel()) : undefined
-    return window ? `${label} · ${formatPriceWindow(window)}` : label
-  }
+  const totalCostLabel = () =>
+    costOn() && totalCost() ? formatCost(sessionCost(), costDigits()) : undefined
 
   return {
     enabled: () => tokensOn() || costOn(),

package/src/usage/messages.ts

@@ -13,6 +13,8 @@ export interface UsageMessage {
   readonly tokens?: MessageTokens
   readonly cost?: number
   readonly model?: { readonly providerID: string; readonly id: string }
+  /** When the step was created, which is when the provider started billing it. */
+  readonly time?: { readonly created?: number }
   /** How the step ended; the host only draws a footer for a finished one. */
   readonly finish?: string | null
   readonly error?: unknown

package/src/usage/price-window.ts

@@ -1,3 +1,5 @@
+import type { UsageMessage } from "./messages"
+
 /** The provider and model a message belongs to. */
 export interface PriceModel {
   readonly providerID: string
@@ -134,3 +136,22 @@ export function priceWindowFor(model: PriceModel | undefined, at: Date): PriceWi
 export function formatPriceWindow(window: PriceWindow): string {
   return `${window.label} ×${window.multiplier}`
 }
+
+/**
+ * The window that applied to a round, from the step that started it. Each
+ * request is billed when it starts, so a round that ran during peak keeps its
+ * marker after the window closes. Only assistant steps carry a start time.
+ */
+export function turnPriceWindow(
+  messages: readonly UsageMessage[],
+  fallback?: PriceModel,
+): PriceWindow | undefined {
+  const step = messages.find(
+    (message) => message.type === "assistant" && message.time?.created !== undefined,
+  )
+  const created = step?.time?.created
+  const model = step?.model ?? fallback
+  if (!model || created === undefined) return undefined
+
+  return priceWindowFor(model, new Date(created))
+}