Merge pull request #406 from getagentseal/fix/pre-release-cleanup

fix: pre-release cleanup - opencode refactor, watchdog backoff, forge dedup

Author: iamtoruk

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 0.9.11 - 2026-05-27
 
 ### Added (CLI)
 - **MCP project profile advisor.** `codeburn optimize` now flags MCP servers
@@ -31,12 +31,42 @@
 - **Claude toolSequence missing from session cache.** `apiCallToCachedCall` was
   not forwarding the `toolSequence` field, so all cached Claude sessions lost
   their tool ordering data.
+- **Forge dedup key instability.** The fallback deduplication key used the raw
+  message array index, which shifts when messages are deleted between scans.
+  Now uses a composite of model name and token counts. Also fixed a variable
+  reference before its declaration that would crash at runtime when no tool
+  call ID was present.
+- **Session cache rejected `subagentTypes` field.** The cache validator did not
+  recognize the `subagentTypes` array, causing entries with this field to be
+  silently dropped and reparsed on every run.
+- **Conflicting date flags on `status` accepted silently.** Passing `--day`
+  with `--from`/`--to`, or `--days` with any other date flag, produced
+  undefined behavior. Now exits with a clear error message.
+
+### Changed (CLI)
+- **OpenCode provider uses shared SQLite parser.** Delegates to
+  `sqlite-session-parser.ts` (same module KiloCode uses), reducing the
+  provider from 498 to 66 lines with no behavior change.
 
 ### Added (macOS menubar)
 - **Configurable menubar status period.** The menubar dropdown now lets you
   choose which period (Today, 7 Days, Month, All Time) is shown in the status
   bar. Persisted via UserDefaults. Thanks @ozymandiashh. (#302)
 
+### Fixed (macOS menubar)
+- **Loading watchdog killed healthy CLI fetches.** The recovery loop ran every
+  8 seconds with no backoff. Each attempt reset the generation counter,
+  discarding in-flight CLI responses (45s timeout) before they could finish.
+  Replaced with exponential backoff (8s to 60s, 6 attempts max) that skips
+  recovery when a fetch is already in flight. Shows an error overlay with a
+  Retry button after all attempts are exhausted.
+- **Multi-day cache key mismatch.** `selectedDay` returned the earliest date
+  instead of nil when multiple days were selected, and
+  `startInteractiveSelectionRefresh` did not pass the day set to the cache key
+  constructor. Both now match `PayloadCacheKey` normalization rules.
+- **Dead code cleanup.** Removed `RefreshBackoff.swift`, its test file, and a
+  broken test that called methods deleted in #393.
+
 ## 0.9.10 - 2026-05-20
 
 ### Added (CLI)

README.md

@@ -13,7 +13,7 @@
     <a href="https://github.com/sponsors/iamtoruk"><img src="https://img.shields.io/badge/sponsor-♥-ea4aaa?logo=github" alt="Sponsor" /></a>                                                  
   </p> 
 
-CodeBurn tracks token usage, cost, and performance across **21 AI coding tools**. It breaks down spending by task type, model, tool, project, and provider so you can see exactly where your budget goes.
+CodeBurn tracks token usage, cost, and performance across **25 AI coding tools**. It breaks down spending by task type, model, tool, project, and provider so you can see exactly where your budget goes.
 
 Everything runs locally. No wrapper, no proxy, no API keys. CodeBurn reads session data directly from disk and prices every call using [LiteLLM](https://github.com/BerriAI/litellm).
 

mac/Sources/CodeBurnMenubar/AppStore.swift

@@ -40,7 +40,7 @@ final class AppStore {
     var selectedDays: Set<String> = []
 
     var selectedDay: String? {
-        guard selectedDays.count == 1 else { return selectedDays.min() }
+        guard selectedDays.count == 1 else { return nil }
         return selectedDays.first
     }
     private(set) var menubarPeriod: Period = Period.savedMenubarPeriod() {
@@ -294,7 +294,8 @@ final class AppStore {
         let period = selectedPeriod
         let provider = selectedProvider
         let day = selectedDay
-        let key = PayloadCacheKey(period: period, provider: provider, day: day)
+        let days = selectedDays
+        let key = PayloadCacheKey(period: period, provider: provider, day: day, days: days)
         lastErrorByKey[key] = nil
         switchTask = Task {
             if provider == .all {
@@ -403,8 +404,15 @@ final class AppStore {
     }
 
     func recoverFromStuckLoading() async {
-        resetLoadingState()
-        await refresh(key: currentKey, includeOptimize: false, force: true, showLoading: true)
+        let key = currentKey
+        guard inFlightKeys[key] == nil else { return }
+        loadingCountsByKey[key] = nil
+        loadingStartedAtByKey[key] = nil
+        await refresh(key: key, includeOptimize: false, force: true, showLoading: true)
+    }
+
+    func setRecoveryExhausted(for label: String) {
+        lastErrorByKey[currentKey] = "Could not load \(label). Check that the codeburn CLI is installed and working."
     }
 
     func refresh(includeOptimize: Bool, force: Bool = false, showLoading: Bool = false) async {

mac/Sources/CodeBurnMenubar/RefreshBackoff.swift

@@ -60,16 +60,17 @@ struct MenuBarContent: View {
                         BurnLoadingOverlay(periodLabel: store.selectionLabel)
                             .transition(.opacity)
                             .task {
-                                // Keep retrying until data loads or the view is removed.
-                                // The original one-shot recovery silently gave up if the
-                                // first attempt also stalled (generation mismatch, CLI
-                                // timeout, day rollover race). Looping guarantees the
-                                // user never sees a permanent spinner.
-                                while !Task.isCancelled {
-                                    try? await Task.sleep(for: .seconds(8))
+                                var delay: Duration = .seconds(8)
+                                let maxDelay: Duration = .seconds(60)
+                                let maxAttempts = 6
+                                for attempt in 1...maxAttempts {
+                                    try? await Task.sleep(for: delay)
                                     guard !Task.isCancelled, !store.hasCachedData else { return }
                                     await store.recoverFromStuckLoading()
+                                    if attempt < maxAttempts { delay = min(delay * 2, maxDelay) }
                                 }
+                                guard !Task.isCancelled, !store.hasCachedData else { return }
+                                store.setRecoveryExhausted(for: store.selectionLabel)
                             }
                     }
                 }

mac/Sources/CodeBurnMenubar/Views/MenuBarContent.swift

@@ -91,15 +91,4 @@ struct AppStoreRefreshRecoveryTests {
         #expect(store.shouldResetInteractiveRefreshPipeline)
     }
 
-    @Test("refresh pause message is visible and clearable")
-    func refreshPauseMessageIsVisibleAndClearable() {
-        let store = AppStore()
-
-        store.pauseAutomaticRefresh(until: Date(timeIntervalSince1970: 4_000), consecutiveStalls: 3)
-        #expect(store.refreshPauseMessage?.contains("Refresh paused") == true)
-        #expect(store.refreshPauseMessage?.contains("3 stalled attempts") == true)
-
-        store.clearRefreshPause()
-        #expect(store.refreshPauseMessage == nil)
-    }
 }

mac/Tests/CodeBurnMenubarTests/AppStoreRefreshRecoveryTests.swift

@@ -1,6 +1,6 @@
 {
   "name": "codeburn",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "description": "See where your AI coding tokens go - by task, tool, model, and project",
   "type": "module",
   "main": "./dist/cli.js",

mac/Tests/CodeBurnMenubarTests/RefreshBackoffTests.swift

@@ -462,6 +462,14 @@ program
   .option('--no-optimize', 'Skip optimize findings (menubar-json only, faster)')
   .action(async (opts) => {
     assertFormat(opts.format, ['terminal', 'menubar-json', 'json'], 'status')
+    if (opts.day && (opts.from || opts.to)) {
+      process.stderr.write('error: --day cannot be combined with --from or --to\n')
+      process.exit(1)
+    }
+    if (opts.days && (opts.day || opts.from || opts.to)) {
+      process.stderr.write('error: --days cannot be combined with --day, --from, or --to\n')
+      process.exit(1)
+    }
     await loadPricing()
     const pf = opts.provider
     const fp = (p: ProjectSummary[]) => filterProjectsByName(p, opts.project, opts.exclude)

package.json

@@ -194,13 +194,13 @@ function createParser(source: SessionSource, seenKeys: Set<string>): SessionPars
           const inputTokens = Math.max(0, promptTokens - cachedInputTokens)
           if (inputTokens === 0 && outputTokens === 0) continue
 
+          const model = typeof text?.model === 'string' ? text.model : 'unknown'
           const calls = toolCalls(text?.tool_calls)
           const { tools, bashCommands, firstCallId } = extractToolsAndCommands(calls)
-          const deduplicationKey = `forge:${row.conversation_id}:${firstCallId ?? i}`
+          const stableId = firstCallId ?? `${model}:${promptTokens}:${outputTokens}:${i}`
+          const deduplicationKey = `forge:${row.conversation_id}:${stableId}`
           if (seenKeys.has(deduplicationKey)) continue
           seenKeys.add(deduplicationKey)
-
-          const model = typeof text?.model === 'string' ? text.model : 'unknown'
           yield {
             provider: 'forge',
             model,