;
burnRate: {
/** USD per hour over the recent window. */
costPerHour: number;
diff --git a/packages/core/src/usage.test.ts b/packages/core/src/usage.test.ts
index 7c45d07..5f7fb55 100644
--- a/packages/core/src/usage.test.ts
+++ b/packages/core/src/usage.test.ts
@@ -38,7 +38,7 @@ describe("deriveUsage", () => {
expect(usage.hasCacheTelemetry).toBe(true);
});
- test("estimates visible output when reasoning is a reported sub-bucket", () => {
+ test("does not subtract reasoning again from normalized visible output", () => {
const usage = deriveUsage({
inputTokens: 75,
cacheReadTokens: 0,
@@ -47,7 +47,7 @@ describe("deriveUsage", () => {
reasoningTokens: 1_024,
});
- expect(usage.visibleOutputTokensApprox).toBe(162);
+ expect(usage.visibleOutputTokensApprox).toBe(1_186);
expect(usage.ledgerTotalTokens).toBe(2_285);
});
});
diff --git a/packages/core/src/usage.ts b/packages/core/src/usage.ts
index 4850946..7cc7fc3 100644
--- a/packages/core/src/usage.ts
+++ b/packages/core/src/usage.ts
@@ -27,8 +27,7 @@ export interface DerivedUsage {
outputTokens: number;
reasoningTokens: number;
/**
- * Best-effort visible output estimate when reasoning is reported as an
- * output sub-bucket by the upstream provider.
+ * Visible output from the normalized ledger (reasoning is already separate).
*/
visibleOutputTokensApprox?: number;
/**
@@ -75,8 +74,7 @@ export function deriveUsage(breakdown: UsageBreakdown): DerivedUsage {
totalInputTokens,
outputTokens,
reasoningTokens,
- visibleOutputTokensApprox:
- reasoningTokens > 0 ? Math.max(0, outputTokens - reasoningTokens) : undefined,
+ visibleOutputTokensApprox: reasoningTokens > 0 ? outputTokens : undefined,
ledgerTotalTokens,
cacheHitRate: totalInputTokens > 0 ? cacheReadTokens / totalInputTokens : 0,
cacheMissRate: totalInputTokens > 0 ? uncachedInputTokens / totalInputTokens : 0,
diff --git a/packages/macos-bar/README.md b/packages/macos-bar/README.md
index d48677f..027a4a5 100644
--- a/packages/macos-bar/README.md
+++ b/packages/macos-bar/README.md
@@ -48,14 +48,17 @@ ad-hoc signs it so macOS Gatekeeper allows local execution.
drishti daemon start
# Launch the app
-open TokmeterBar.app
+open /Applications/TokmeterBar.app
```
-The menubar icon shows `♾️ $X.YY` (today's cost). Click it to see:
-- Today / Total Tokens / Total Cost
-- Top 3 models bar chart
-- 7-day cost line chart
-- Projects / Active Days / Streak
+The menubar icon shows today's tokens. Click it to see:
+- Today's tokens, estimated API cost, and tool-reported cost separately
+- Today's models, with Today/All and Show all controls
+- Today's projects
+- Usage details: lifetime totals, trends, cache and other signals
+
+Costs are not a verified subscription bill. Missing cost data is shown as unavailable.
+See [how the numbers work](../../docs/how-the-numbers-work.md).
It refreshes every 30 seconds.
diff --git a/packages/macos-bar/Sources/TokmeterBar/DaemonClient.swift b/packages/macos-bar/Sources/TokmeterBar/DaemonClient.swift
index 2b69d4e..5fb142d 100644
--- a/packages/macos-bar/Sources/TokmeterBar/DaemonClient.swift
+++ b/packages/macos-bar/Sources/TokmeterBar/DaemonClient.swift
@@ -154,8 +154,8 @@ final class DaemonClient {
/// All sessions across all providers, up to 50 items, sorted by recency.
/// Used for the expandable session list in the popover.
- func fetchSessions() async throws -> [ProjectData] {
- try await get("/api/sessions", as: [ProjectData].self)
+ func fetchSessions(today: Bool = false) async throws -> [ProjectData] {
+ try await get(today ? "/api/sessions?today=true" : "/api/sessions", as: [ProjectData].self)
}
func fetchProjectDetail(_ projectName: String) async throws -> ProjectDetailData {
diff --git a/packages/macos-bar/Sources/TokmeterBar/DataSections.swift b/packages/macos-bar/Sources/TokmeterBar/DataSections.swift
index fdca192..2da1b9c 100644
--- a/packages/macos-bar/Sources/TokmeterBar/DataSections.swift
+++ b/packages/macos-bar/Sources/TokmeterBar/DataSections.swift
@@ -19,17 +19,26 @@ struct ModelsSection: View {
@ObservedObject var loader: TokmeterLoader
let theme: AppTheme
- @State private var showToday: Bool = false
+ @State private var showToday: Bool = true
+ @State private var showAllModels: Bool = false
private var c: ThemeColors { theme.colors }
- private var activeModels: [ModelUsage] { showToday ? loader.todayModels : loader.topModels }
+ private var availableModels: [ModelUsage] { showToday ? loader.todayModels : loader.topModels }
+ private var activeModels: [ModelUsage] {
+ if showAllModels { return availableModels }
+ let ranked = Array(availableModels.prefix(5))
+ guard showToday else { return ranked }
+ // Preserve visibility for activity whose cost isn't exposed.
+ let rankedIDs = Set(ranked.map(\.id))
+ return ranked + availableModels.filter { $0.cost == 0 && !rankedIDs.contains($0.id) }.prefix(3)
+ }
var body: some View {
VStack(alignment: .leading, spacing: 8) {
HStack(alignment: .center) {
SectionHeader(
label: showToday ? "TODAY'S MODELS" : "TOP MODELS",
- count: activeModels.count,
+ count: availableModels.count,
theme: theme
)
Spacer()
@@ -57,6 +66,14 @@ struct ModelsSection: View {
ForEach(activeModels) { model in
modelRow(model, maxCost: maxCost, showProvider: dupNames.contains(model.model))
}
+ if showAllModels || availableModels.count > activeModels.count {
+ Button(showAllModels ? "Show fewer" : "Show all \(availableModels.count) models") {
+ showAllModels.toggle()
+ }
+ .buttonStyle(.plain)
+ .font(.system(size: 10, design: theme.fonts.bodyDesign))
+ .foregroundColor(theme.backgroundMode.secondaryTextColor)
+ }
}
}
}
@@ -80,7 +97,7 @@ struct ModelsSection: View {
.padding(.vertical, 3)
.background(active ? Capsule().fill(c.accent.opacity(0.18)) : nil)
}
- .buttonStyle(.borderless)
+ .buttonStyle(.plain)
}
/// True whenever cost is honestly $0 rather than guessed — covers both
@@ -91,7 +108,11 @@ struct ModelsSection: View {
/// guessing an input/output split to price it from). Drawn distinctly so
/// neither case reads as "$0.00 = confirmed free."
private func isActivityOnly(_ model: ModelUsage) -> Bool {
- model.cost == 0
+ guard model.cost == 0 else { return false }
+ if showToday, let basis = loader.statbarSignals?.modelCostBasisToday?[model.id] {
+ return basis.unavailableRecords > 0 || basis.estimatedRecords + basis.reportedRecords == 0
+ }
+ return true
}
private func modelRow(_ model: ModelUsage, maxCost: Double, showProvider: Bool = false) -> some View {
@@ -149,7 +170,7 @@ struct ModelsSection: View {
.help(
activityOnly
? (model.tokens > 0
- ? "Real token count from this provider's local state — cost isn't shown because there's no reliable input/output split to price it from."
+ ? "\(Fmt.number(model.tokens)) tokens. Cost is unavailable because pricing or a reliable token breakdown is missing."
: "This provider doesn't expose token counts or cost locally — only that you used it.")
: compositionTooltip(
output: model.outputTokens,
@@ -164,7 +185,7 @@ struct ModelsSection: View {
// count (e.g. Codex Desktop's SQLite-sourced total) — show
// that number rather than an unhelpful "no cost data" when we
// actually have real data, just not a priceable one.
- Text(model.tokens > 0 ? "\(Fmt.number(model.tokens)) tok" : "no cost data")
+ Text("Unavailable")
.font(.system(size: 9, weight: .medium, design: theme.fonts.bodyDesign))
.foregroundColor(theme.backgroundMode.secondaryTextColor)
.frame(width: 56, alignment: .trailing)
@@ -366,23 +387,23 @@ struct SessionsSection: View {
var body: some View {
VStack(alignment: .leading, spacing: 6) {
- SectionHeader(label: "SESSIONS", count: loader.sessions.count, theme: theme)
+ SectionHeader(label: "TODAY’S PROJECTS", count: loader.todayProjects.count, theme: theme)
if loader.isWarming {
ForEach(0..<5, id: \.self) { _ in
ShimmerBar(width: 340, height: 28, breathToggle: true)
}
} else {
- let visible = showAll ? loader.sessions : Array(loader.sessions.prefix(8))
+ let visible = showAll ? loader.todayProjects : Array(loader.todayProjects.prefix(8))
ForEach(visible) { session in
row(session)
}
- if loader.sessions.count > 8 && !showAll {
+ if loader.todayProjects.count > 8 && !showAll {
Button {
withAnimation(.spring(response: 0.5, dampingFraction: 0.85)) { showAll = true }
} label: {
HStack(spacing: 4) {
- Text("Show all \(loader.sessions.count)")
+ Text("Show all \(loader.todayProjects.count)")
.font(.system(size: 11, weight: .medium, design: theme.fonts.bodyDesign))
Image(systemName: "chevron.down").font(.system(size: 9))
}
@@ -419,7 +440,7 @@ struct SessionsSection: View {
.foregroundColor(theme.backgroundMode.primaryTextColor)
.lineLimit(1)
.help(session.project)
- Text("\(session.activeDays)d · \(Fmt.number(session.totalTokens)) tokens")
+ Text("\(Fmt.number(session.totalTokens)) tokens today")
.font(.system(size: 10, design: theme.fonts.bodyDesign))
.foregroundColor(theme.backgroundMode.secondaryTextColor)
}
diff --git a/packages/macos-bar/Sources/TokmeterBar/FooterBar.swift b/packages/macos-bar/Sources/TokmeterBar/FooterBar.swift
index d24762c..7f9a12e 100644
--- a/packages/macos-bar/Sources/TokmeterBar/FooterBar.swift
+++ b/packages/macos-bar/Sources/TokmeterBar/FooterBar.swift
@@ -60,6 +60,15 @@ struct FooterBar: View {
Text("v\(appVersion)")
.font(.system(size: 10, design: theme.fonts.bodyDesign))
.foregroundColor(theme.backgroundMode.secondaryTextColor)
+ if let resources = Bundle.main.resourceURL {
+ Button("Licenses & source") {
+ NSWorkspace.shared.open(resources.appendingPathComponent("Licenses"))
+ }
+ .buttonStyle(.plain)
+ .font(.system(size: 9, design: theme.fonts.bodyDesign))
+ .foregroundColor(theme.backgroundMode.secondaryTextColor)
+ .help("Open license texts, third-party notices, and the source archive")
+ }
Spacer()
// Amber pill when today's records contain models with no resolved
// pricing — silent $0 leaks would otherwise hide in the totals.
diff --git a/packages/macos-bar/Sources/TokmeterBar/HeroHeader.swift b/packages/macos-bar/Sources/TokmeterBar/HeroHeader.swift
index d7bf8e2..7741683 100644
--- a/packages/macos-bar/Sources/TokmeterBar/HeroHeader.swift
+++ b/packages/macos-bar/Sources/TokmeterBar/HeroHeader.swift
@@ -30,12 +30,6 @@ struct HeroHeader: View {
/// overlay on the top-level VStack so it floats above the scroll content.
@Binding var showCachePanel: Bool
- /// Briefly bumped to >1 / non-zero degrees when `todayCost` changes so
- /// the hero number reacts visibly to fresh data — secondary action that
- /// reinforces the ECG's "live" message.
- @State private var costWiggleScale: CGFloat = 1.0
- @State private var costWiggleAngle: Double = 0
-
private var c: ThemeColors { theme.colors }
var body: some View {
@@ -125,67 +119,60 @@ struct HeroHeader: View {
}
}
- /// Main value row. Hero number + "today" inline at the value baseline so
- /// we spend one row instead of two. Tight line-spacing keeps the whole
- /// hero from ballooning with leading whitespace around the glyphs.
+ /// Usage is the headline; monetary estimates and tool reports stay separate.
private var valueRow: some View {
HStack(alignment: .lastTextBaseline, spacing: 6) {
if loader.isWarming {
skeletonHero
} else {
- Text(Fmt.cost(loader.todayCost))
+ Text(Fmt.number(loader.todayTokens))
.font(theme.fonts.hero(size: heroFontSize))
.foregroundColor(foreground)
.contentTransition(.numericText())
- .scaleEffect(costWiggleScale)
- .rotationEffect(.degrees(costWiggleAngle))
- // Tighten the text's intrinsic leading so large fonts don't
- // leave vertical padding around glyphs. Caps the line height
- // to the actual font size.
- .fixedSize(horizontal: false, vertical: true)
.lineLimit(1)
- .animation(.spring(response: 0.55, dampingFraction: 0.70), value: loader.todayCost)
- .onChange(of: loader.todayCost) { _, _ in
- // Two-step wiggle: pop up + tilt, then settle back.
- // The seed-driven tilt direction adds organic variance.
- let tiltDirection: Double = Bool.random() ? 1.0 : -1.0
- costWiggleScale = 1.04
- costWiggleAngle = 0.6 * tiltDirection
- withAnimation(.spring(response: 0.32, dampingFraction: 0.50)) {
- costWiggleScale = 1.0
- costWiggleAngle = 0
- }
- }
- Text("today")
+ .minimumScaleFactor(0.6)
+ Text("tokens today")
.font(.system(size: 10, weight: .medium, design: theme.fonts.bodyDesign))
- .italic()
.foregroundColor(foreground.opacity(0.65))
}
}
}
- /// Compact per-tier line under the hero cost — "64.5M tok · 787K in ·
- /// 276K out · 62.4M cached". Hidden while warming or when the daemon
- /// response predates the breakdown fields (all tiers zero).
@ViewBuilder
private var tokenBreakdownRow: some View {
- if !loader.isWarming, loader.todayTokens > 0,
- loader.todayInputTokens + loader.todayOutputTokens + loader.todayCachedTokens > 0 {
- Text(
- "\(Fmt.number(loader.todayTokens)) tok · \(Fmt.number(loader.todayInputTokens)) in"
- + " · \(Fmt.number(loader.todayOutputTokens)) out"
- + " · \(Fmt.number(loader.todayCachedTokens)) cached"
- )
- .font(.system(size: 9, weight: .medium, design: theme.fonts.bodyDesign))
- .foregroundColor(foreground.opacity(0.55))
- .lineLimit(1)
- .padding(.top, 2)
- .contentTransition(.numericText())
- .animation(.default, value: loader.todayTokens)
+ if !loader.isWarming {
+ VStack(alignment: .leading, spacing: 4) {
+ if let basis = loader.statbarSignals?.costBasisToday {
+ if basis.estimatedRecords > 0 {
+ costLine("Estimated API cost", value: basis.estimatedCost)
+ }
+ if basis.reportedRecords > 0 {
+ costLine("Tool-reported cost", value: basis.reportedCost)
+ }
+ if basis.unavailableRecords > 0 {
+ Text("Cost unavailable for some usage")
+ .foregroundColor(Color.tokWarning)
+ } else if basis.estimatedRecords + basis.reportedRecords == 0 {
+ Text("No usage recorded today")
+ }
+ } else {
+ Text("Cost breakdown unavailable")
+ }
+ }
+ .font(.system(size: 10, weight: .medium, design: theme.fonts.bodyDesign))
+ .foregroundColor(foreground.opacity(0.75))
+ .padding(.top, 4)
+ .help("API estimates value usage at model rates. Tool-reported costs come from local usage records. Neither is a verified subscription bill.")
}
}
- // MARK: - Status indicator (pill or live ECG)
+ private func costLine(_ label: String, value: Double) -> some View {
+ HStack {
+ Text(label)
+ Spacer()
+ Text(Fmt.cost(value)).monospacedDigit()
+ }
+ }
@ViewBuilder
private var statusIndicator: some View {
diff --git a/packages/macos-bar/Sources/TokmeterBar/HubOverview.swift b/packages/macos-bar/Sources/TokmeterBar/HubOverview.swift
index 7a85d49..4f1d44a 100644
--- a/packages/macos-bar/Sources/TokmeterBar/HubOverview.swift
+++ b/packages/macos-bar/Sources/TokmeterBar/HubOverview.swift
@@ -77,7 +77,7 @@ struct HubOverviewPanel: View {
Text("Overview")
.font(.system(size: 24, weight: .bold, design: theme.fonts.heroDesign))
.foregroundColor(bg.primaryTextColor)
- Text("Everything you've spent, everywhere — at a glance.")
+ Text("Usage across your projects. Costs include estimates and tool reports.")
.font(.system(size: 12, design: theme.fonts.bodyDesign))
.foregroundColor(bg.secondaryTextColor)
}
diff --git a/packages/macos-bar/Sources/TokmeterBar/Models.swift b/packages/macos-bar/Sources/TokmeterBar/Models.swift
index 80a2c1c..b408410 100644
--- a/packages/macos-bar/Sources/TokmeterBar/Models.swift
+++ b/packages/macos-bar/Sources/TokmeterBar/Models.swift
@@ -425,7 +425,18 @@ struct CrossToolComparison: Codable, Equatable {
let projections: [CrossToolProjection]
}
+struct CostBasis: Codable, Equatable {
+ let estimatedCost: Double
+ let reportedCost: Double
+ let unclassifiedCost: Double
+ let estimatedRecords: Int
+ let reportedRecords: Int
+ let unavailableRecords: Int
+}
+
struct StatbarSignals: Codable, Equatable {
+ var costBasisToday: CostBasis? = nil
+ var modelCostBasisToday: [String: CostBasis]? = nil
let burnRate: BurnRate
let cacheHitToday: CacheHitToday
let contextPressure: ContextPressure?
diff --git a/packages/macos-bar/Sources/TokmeterBar/StatCards.swift b/packages/macos-bar/Sources/TokmeterBar/StatCards.swift
index 01870fe..95446e9 100644
--- a/packages/macos-bar/Sources/TokmeterBar/StatCards.swift
+++ b/packages/macos-bar/Sources/TokmeterBar/StatCards.swift
@@ -64,7 +64,7 @@ struct StatsGrid: View {
)
StatCard(
icon: "dollarsign.circle.fill",
- label: "SPENT",
+ label: "COST TOTAL",
value: Fmt.cost(loader.totalCost),
role: c.highlight,
delta: weekDelta { $0.cost },
diff --git a/packages/macos-bar/Sources/TokmeterBar/TokmeterBarApp.swift b/packages/macos-bar/Sources/TokmeterBar/TokmeterBarApp.swift
index 6367005..a82d85e 100644
--- a/packages/macos-bar/Sources/TokmeterBar/TokmeterBarApp.swift
+++ b/packages/macos-bar/Sources/TokmeterBar/TokmeterBarApp.swift
@@ -45,7 +45,7 @@ struct TokmeterBarApp: App {
if let pct = activePct {
return "\(Int(pct.rounded()))%"
}
- return String(format: "$%.2f", loader.todayCost)
+ return "\(Fmt.number(loader.todayTokens)) tok"
}
/// The percentage for the selected live source, if it has data right now.
@@ -85,7 +85,7 @@ struct TokmeterBarApp: App {
if loader.lastError != nil {
return "Tokmeter: daemon offline"
}
- let base = String(format: "Tokmeter: today's cost is $%.2f", loader.todayCost)
+ let base = "Tokmeter: \(Fmt.number(loader.todayTokens)) tokens today"
guard let band = menubarBand, let pct = activePct else { return base }
let sourceName: String
switch config.config.colorSource {
diff --git a/packages/macos-bar/Sources/TokmeterBar/TokmeterBarView.swift b/packages/macos-bar/Sources/TokmeterBar/TokmeterBarView.swift
index d48b445..c1f8063 100644
--- a/packages/macos-bar/Sources/TokmeterBar/TokmeterBarView.swift
+++ b/packages/macos-bar/Sources/TokmeterBar/TokmeterBarView.swift
@@ -30,7 +30,6 @@ struct TokmeterBarView: View {
@AppStorage("appTheme") var theme: AppTheme = .nebula
/// Local UI state — never persisted.
- @State private var showAllSessions = false
@State private var breathToggle = false
/// Tracks whether this popover's window is actually on screen — see
/// PanelVisibility.swift. Every ambient animation in the hero/footer is
@@ -67,28 +66,7 @@ struct TokmeterBarView: View {
.cascadeIn(delay: 0.08)
ScrollView(.vertical, showsIndicators: true) {
- VStack(alignment: .leading, spacing: 16) {
- // Thin "right now" telemetry strip — burn rate, cache hit,
- // compaction tax. Self-hides when there's no live signal.
- SignalsRibbon(loader: loader, theme: theme)
- .cascadeIn(delay: 0.10)
- // CACHE & CONTEXT is no longer inline — it lives in the
- // wallet drawer, opened from the hero header icon.
- StatsGrid(loader: loader, theme: theme)
- .cascadeIn(delay: 0.14)
- if !loader.topModels.isEmpty || loader.isWarming {
- ModelsSection(loader: loader, theme: theme)
- .cascadeIn(delay: 0.22)
- }
- if loader.recentDaily.count > 1 || loader.isWarming {
- WeekSection(loader: loader, theme: theme)
- .cascadeIn(delay: 0.30)
- }
- if !loader.sessions.isEmpty || loader.isWarming {
- SessionsSection(loader: loader, theme: theme, showAll: $showAllSessions)
- .cascadeIn(delay: 0.38)
- }
- }
+ UsageOverview(loader: loader, theme: theme)
.padding(.horizontal, 16)
.padding(.top, 14)
.padding(.bottom, 10)
@@ -109,7 +87,7 @@ struct TokmeterBarView: View {
.cascadeIn(delay: 0.46)
}
.frame(width: 400)
- .frame(minHeight: 620, maxHeight: 820)
+ .frame(minHeight: 520, maxHeight: 780)
.background(popoverBackground)
.trackPanelVisibility(panelVisibility)
// Cache "wallet" drawer — slides in from the trailing edge over the
diff --git a/packages/macos-bar/Sources/TokmeterBar/TokmeterLoader.swift b/packages/macos-bar/Sources/TokmeterBar/TokmeterLoader.swift
index 26990f5..934ca11 100644
--- a/packages/macos-bar/Sources/TokmeterBar/TokmeterLoader.swift
+++ b/packages/macos-bar/Sources/TokmeterBar/TokmeterLoader.swift
@@ -29,6 +29,7 @@ final class TokmeterLoader: ObservableObject {
@Published var recentDaily: [DailyUsage] = []
@Published var allDaily: [DailyUsage] = []
@Published var sessions: [ProjectData] = []
+ @Published var todayProjects: [ProjectData] = []
/// Live "right now" signals — burn rate, cache hit, pace vs typical,
/// compaction tax, live session. nil until the first phase-2 fetch.
@Published var statbarSignals: StatbarSignals?
@@ -112,7 +113,8 @@ final class TokmeterLoader: ObservableObject {
/// a PID singleton on disk; this just stops the bar from spamming spawns.
var isStartingDaemon: Bool = false
- init() {
+ init(startPolling: Bool = true) {
+ guard startPolling else { return }
Task { await loadData() }
let initial = HubConfigStore.shared.config.bar.refreshSeconds
restartTimer(interval: TimeInterval(initial))
@@ -126,6 +128,19 @@ final class TokmeterLoader: ObservableObject {
startColorTimer()
}
+ func applyToday(from daily: [DailyData], now: Date = Date()) {
+ let formatter = DateFormatter()
+ formatter.calendar = Calendar.current
+ formatter.locale = Locale(identifier: "en_US_POSIX")
+ formatter.dateFormat = "yyyy-MM-dd"
+ let today = daily.first { $0.date == formatter.string(from: now) }
+ todayCost = today?.cost ?? 0
+ todayTokens = today?.totalTokens ?? 0
+ todayInputTokens = today?.inputTokens ?? 0
+ todayOutputTokens = today?.outputTokens ?? 0
+ todayCachedTokens = (today?.cacheReadTokens ?? 0) + (today?.cacheWriteTokens ?? 0)
+ }
+
private func startColorTimer() {
colorTimer?.invalidate()
colorTimer = Timer.scheduledTimer(
@@ -242,6 +257,7 @@ final class TokmeterLoader: ObservableObject {
async let modelsTask = fetchModelsSafe()
async let todayModelsTask = fetchTodayModelsSafe()
async let sessionsTask = fetchSessionsSafe()
+ async let todayProjectsTask = try? client.fetchSessions(today: true)
async let pricingStatusTask = fetchPricingStatusSafe()
async let cronStatusTask = fetchCronStatusSafe()
async let healthTask = fetchHealthSafe()
@@ -257,6 +273,7 @@ final class TokmeterLoader: ObservableObject {
modelsResult,
todayModelsResult,
sessionsResult,
+ todayProjectsResult,
pricingStatusResult,
cronStatusResult,
healthResult,
@@ -265,45 +282,26 @@ final class TokmeterLoader: ObservableObject {
crossToolResult,
antigravityLiveResult
) = await (
- dailyTask, modelsTask, todayModelsTask, sessionsTask, pricingStatusTask,
+ dailyTask, modelsTask, todayModelsTask, sessionsTask, todayProjectsTask, pricingStatusTask,
cronStatusTask, healthTask, anomaliesTask, signalsTask, crossToolTask,
antigravityLiveTask
)
withTransaction(noAnim) {
if let daily = dailyResult {
- if let today = daily.last {
- self.todayCost = today.cost
- self.todayTokens = today.totalTokens
- self.todayInputTokens = today.inputTokens ?? 0
- self.todayOutputTokens = today.outputTokens ?? 0
- self.todayCachedTokens = (today.cacheReadTokens ?? 0) + (today.cacheWriteTokens ?? 0)
- }
+ self.applyToday(from: daily)
let mapped = daily.map { DailyUsage(date: $0.date, tokens: $0.totalTokens, cost: $0.cost) }
self.allDaily = mapped
self.recentDaily = Array(mapped.suffix(7))
}
if let models = modelsResult {
- self.topModels = models.prefix(5).map(Self.toUsage)
+ self.topModels = models.map(Self.toUsage)
}
if let todayMs = todayModelsResult {
- // Quota-billed/activity-only clients (VS Code Copilot,
- // Antigravity) and real-but-unpriced totals (Codex Desktop's
- // SQLite fallback — genuine non-zero tokens, cost honestly
- // left unexposed) both report cost == 0 — a pure cost
- // ranking always buries them under same-day providers that
- // DO report dollars, so "I used X today" silently never
- // shows up. Top 5 by cost stays the primary ranking; up to 3
- // cost==0 entries are appended so today's real usage is
- // never invisible just because it isn't priced.
- let all = todayMs.map(Self.toUsage)
- let ranked = Array(all.prefix(5))
- let rankedKeys = Set(ranked.map { "\($0.provider)/\($0.model)" })
- let activityOnly = all
- .filter { $0.cost == 0 && !rankedKeys.contains("\($0.provider)/\($0.model)") }
- .prefix(3)
- self.todayModels = ranked + activityOnly
+ // Keep the complete list; the view owns its collapsed limit.
+ self.todayModels = todayMs.map(Self.toUsage)
}
+ if let projects = todayProjectsResult { self.todayProjects = projects }
if let sessionsList = sessionsResult {
self.sessions = sessionsList
}
diff --git a/packages/macos-bar/Sources/TokmeterBar/UsageOverview.swift b/packages/macos-bar/Sources/TokmeterBar/UsageOverview.swift
new file mode 100644
index 0000000..1954bb3
--- /dev/null
+++ b/packages/macos-bar/Sources/TokmeterBar/UsageOverview.swift
@@ -0,0 +1,35 @@
+// Shared by the live popover and the fixture-backed visual demo.
+import SwiftUI
+
+struct UsageOverview: View {
+ @ObservedObject var loader: TokmeterLoader
+ let theme: AppTheme
+ @State private var showAllSessions = false
+ @State private var showUsageDetails = false
+
+ var body: some View {
+ VStack(alignment: .leading, spacing: 16) {
+ if !loader.topModels.isEmpty || !loader.todayModels.isEmpty || loader.isWarming {
+ ModelsSection(loader: loader, theme: theme)
+ }
+ if !loader.todayProjects.isEmpty || loader.isWarming {
+ SessionsSection(loader: loader, theme: theme, showAll: $showAllSessions)
+ }
+ Text("Model and project costs may combine estimates and tool reports.")
+ .font(.system(size: 9, design: theme.fonts.bodyDesign))
+ .foregroundColor(theme.backgroundMode.secondaryTextColor)
+ DisclosureGroup("Usage details", isExpanded: $showUsageDetails) {
+ VStack(spacing: 14) {
+ SignalsRibbon(loader: loader, theme: theme)
+ StatsGrid(loader: loader, theme: theme)
+ if loader.recentDaily.count > 1 || loader.isWarming {
+ WeekSection(loader: loader, theme: theme)
+ }
+ }
+ .padding(.top, 10)
+ }
+ .font(.system(size: 11, weight: .medium, design: theme.fonts.bodyDesign))
+ .tint(theme.backgroundMode.secondaryTextColor)
+ }
+ }
+}
diff --git a/packages/macos-bar/Tests/TokmeterBarTests/DemoRenderTests.swift b/packages/macos-bar/Tests/TokmeterBarTests/DemoRenderTests.swift
new file mode 100644
index 0000000..4c4fe89
--- /dev/null
+++ b/packages/macos-bar/Tests/TokmeterBarTests/DemoRenderTests.swift
@@ -0,0 +1,58 @@
+import AppKit
+import SwiftUI
+import XCTest
+@testable import TokmeterBar
+
+private struct DemoScene: Decodable {
+ let caption: String
+ let tokens: Int
+ let signals: StatbarSignals
+ let models: [ModelData]
+ let projects: [ProjectData]
+}
+
+final class DemoRenderTests: XCTestCase {
+ /// Opt-in artifact rendering uses the production SwiftUI views and synthetic data.
+ @MainActor
+ func testRenderWalkthrough() throws {
+ guard let directory = ProcessInfo.processInfo.environment["TOKMETER_DEMO_DIR"] else {
+ throw XCTSkip("Set TOKMETER_DEMO_DIR to render the public walkthrough")
+ }
+ let root = URL(fileURLWithPath: directory)
+ let scenes = try JSONDecoder().decode([DemoScene].self, from: Data(contentsOf: root.appendingPathComponent("snapshots.json")))
+ for (index, scene) in scenes.enumerated() {
+ let loader = TokmeterLoader(startPolling: false)
+ loader.isWarming = false
+ loader.hasFreshData = true
+ loader.todayTokens = scene.tokens
+ loader.statbarSignals = scene.signals
+ loader.todayModels = scene.models.map(TokmeterLoader.toUsage)
+ loader.topModels = loader.todayModels
+ loader.todayProjects = scene.projects
+ let view = VStack(alignment: .leading, spacing: 0) {
+ Text(scene.caption)
+ .font(.system(size: 15, weight: .semibold))
+ .foregroundStyle(.white)
+ .padding(16)
+ HeroHeader(loader: loader, theme: .nebula, breathToggle: false, isVisible: false, showCachePanel: .constant(false))
+ UsageOverview(loader: loader, theme: .nebula)
+ .padding(16)
+ Spacer(minLength: 8)
+ Text("DEMO DATA · API estimates are not your subscription bill")
+ .font(.system(size: 9))
+ .foregroundStyle(.secondary)
+ .padding(16)
+ }
+ .frame(width: 400, height: 560, alignment: .topLeading)
+ .background(Color(red: 0.035, green: 0.04, blue: 0.07))
+ .environment(\.colorScheme, .dark)
+ let renderer = ImageRenderer(content: view)
+ renderer.scale = 2
+ let image = try XCTUnwrap(renderer.nsImage)
+ let tiff = try XCTUnwrap(image.tiffRepresentation)
+ let bitmap = try XCTUnwrap(NSBitmapImageRep(data: tiff))
+ let png = try XCTUnwrap(bitmap.representation(using: .png, properties: [:]))
+ try png.write(to: root.appendingPathComponent(String(format: "scene-%02d.png", index)))
+ }
+ }
+}
diff --git a/packages/macos-bar/Tests/TokmeterBarTests/TodayUsageTests.swift b/packages/macos-bar/Tests/TokmeterBarTests/TodayUsageTests.swift
new file mode 100644
index 0000000..7298b69
--- /dev/null
+++ b/packages/macos-bar/Tests/TokmeterBarTests/TodayUsageTests.swift
@@ -0,0 +1,27 @@
+import XCTest
+@testable import TokmeterBar
+
+final class TodayUsageTests: XCTestCase {
+ @MainActor
+ func testIdleTodayDoesNotInheritLastActiveDay() throws {
+ let loader = TokmeterLoader(startPolling: false)
+ let old = try JSONDecoder().decode(DailyData.self, from: Data("""
+ {"date":"2026-09-04","totalTokens":1100,"cost":1.25}
+ """.utf8))
+ let now = Calendar.current.date(from: DateComponents(year: 2026, month: 9, day: 6, hour: 12))!
+ loader.todayTokens = 999
+ loader.todayCost = 9
+ loader.applyToday(from: [old], now: now)
+ XCTAssertEqual(loader.todayTokens, 0)
+ XCTAssertEqual(loader.todayCost, 0)
+ }
+
+ func testCostBreakdownPreservesUnavailableAndReportedZero() throws {
+ let basis = try JSONDecoder().decode(CostBasis.self, from: Data("""
+ {"estimatedCost":1.25,"reportedCost":0,"unclassifiedCost":0,"estimatedRecords":2,"reportedRecords":1,"unavailableRecords":3}
+ """.utf8))
+ XCTAssertEqual(basis.reportedRecords, 1)
+ XCTAssertEqual(basis.unavailableRecords, 3)
+ XCTAssertEqual(basis.estimatedCost, 1.25)
+ }
+}
diff --git a/packages/macos-bar/bundle.sh b/packages/macos-bar/bundle.sh
index 0aa72c7..0c5e719 100755
--- a/packages/macos-bar/bundle.sh
+++ b/packages/macos-bar/bundle.sh
@@ -60,8 +60,8 @@ MACOS_DIR="${CONTENTS}/MacOS"
RESOURCES_DIR="${CONTENTS}/Resources"
FRAMEWORKS_DIR="${CONTENTS}/Frameworks"
ENTITLEMENTS="entitlements.plist"
-SHORT_VERSION="${CFBundleShortVersionString:-1.9.2}"
-BUILD_VERSION="${CFBundleVersion:-44}"
+SHORT_VERSION="${CFBundleShortVersionString:-1.10.0}"
+BUILD_VERSION="${CFBundleVersion:-46}"
SUFEED_URL="${SUFEED_URL:-https://raw.githubusercontent.com/sriinnu/tokmeter/main/packages/macos-bar/appcast.xml}"
SUPUBLIC_KEY="${SUPUBLIC_KEY:-}" # populated below if private key is present
@@ -110,6 +110,9 @@ if [[ -d "${SPARKLE_XC}" ]]; then
fi
fi
+# License notices and matching source travel with the signed app.
+python3 ../../scripts/prepare-license-materials.py macos --destination "${RESOURCES_DIR}/Licenses"
+
# ─── 4b. Copy the app icon so Finder/Dock don't show a grey placeholder ──
# AppIcon.icns is produced by ./generate-icon.sh and committed to the repo.
# If it's missing, fall back to generating it on the fly.
diff --git a/packages/mcp/package.json b/packages/mcp/package.json
index 477886d..4b882a2 100644
--- a/packages/mcp/package.json
+++ b/packages/mcp/package.json
@@ -1,6 +1,6 @@
{
"name": "@sriinnu/drishti",
- "version": "1.9.2",
+ "version": "1.10.0",
"description": "दृष्टि — MCP server + live token observatory for AI coding agents",
"type": "module",
"bin": {
@@ -32,6 +32,7 @@
},
"files": ["dist"],
"scripts": {
+ "prepack": "python3 ../../scripts/prepare-license-materials.py npm",
"build": "tsc",
"dev": "bun src/cli.ts",
"serve": "bun src/cli.ts serve",
diff --git a/packages/mcp/src/daemon/server.ts b/packages/mcp/src/daemon/server.ts
index 35998fc..7ca9df3 100644
--- a/packages/mcp/src/daemon/server.ts
+++ b/packages/mcp/src/daemon/server.ts
@@ -1017,7 +1017,9 @@ function startHttpApi(): void {
// All projects across providers, sorted by most-recently-used descending.
// Used by the menubar's expandable session list — supports 10/20/50+ items.
const projects = core
- .getAllProjects()
+ .getAllProjects({
+ today: new URL(url, "http://localhost").searchParams.get("today") === "true",
+ })
.slice()
.sort((a: { lastUsed: number }, b: { lastUsed: number }) => b.lastUsed - a.lastUsed);
json(res, projects.slice(0, 50));
diff --git a/packages/tokmeter/package.json b/packages/tokmeter/package.json
index deb6f73..56f4f5f 100644
--- a/packages/tokmeter/package.json
+++ b/packages/tokmeter/package.json
@@ -1,6 +1,6 @@
{
"name": "@sriinnu/tokmeter",
- "version": "1.9.2",
+ "version": "1.10.0",
"description": "Token usage tracking for AI coding agents — parsers, CLI, and TUI",
"type": "module",
"main": "dist/core/index.js",
@@ -25,6 +25,7 @@
},
"files": ["dist"],
"scripts": {
+ "prepack": "python3 ../../scripts/prepare-license-materials.py npm",
"build": "rm -rf dist && mkdir -p dist/core dist/cli dist/tui && cp -r ../core/dist/* dist/core/ && cp -r ../cli/dist/* dist/cli/ && cp -r ../tui/dist/* dist/tui/"
},
"dependencies": {
diff --git a/packages/tui/package.json b/packages/tui/package.json
index c28de42..9a89a64 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -1,6 +1,6 @@
{
"name": "@sriinnu/tokmeter-tui",
- "version": "1.9.2",
+ "version": "1.10.0",
"private": true,
"description": "Token usage tracking TUI \u2014 interactive terminal UI with charts",
"type": "module",
diff --git a/packages/web/package.json b/packages/web/package.json
index 6c77cbf..6ae7b50 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -1,6 +1,6 @@
{
"name": "@sriinnu/tokmeter-web",
- "version": "1.9.2",
+ "version": "1.10.0",
"private": true,
"description": "Token usage tracking web dashboard \u2014 React + Plotly",
"type": "module",
diff --git a/packages/web/src/pages/dashboard/DashboardOverviewSection.tsx b/packages/web/src/pages/dashboard/DashboardOverviewSection.tsx
index cdbb378..16b280c 100644
--- a/packages/web/src/pages/dashboard/DashboardOverviewSection.tsx
+++ b/packages/web/src/pages/dashboard/DashboardOverviewSection.tsx
@@ -37,6 +37,10 @@ export const DashboardOverviewSection = memo(function DashboardOverviewSection({
{insights.spotlight.eyebrow}
{insights.spotlight.title}
{insights.spotlight.body}
+
+ Cost totals combine API-rate estimates and tool-reported amounts; they are not a
+ verified subscription bill. Missing prices are excluded.
+
{insights.spotlight.chips.map((chip) => (
@@ -135,7 +139,7 @@ export const DashboardOverviewSection = memo(function DashboardOverviewSection({
diff --git a/scripts/generate-demo.ts b/scripts/generate-demo.ts
new file mode 100644
index 0000000..c9b95f7
--- /dev/null
+++ b/scripts/generate-demo.ts
@@ -0,0 +1,84 @@
+/** Offline, synthetic data for the native walkthrough. Never reads user logs. */
+import { mkdirSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+import {
+ computeAllProjectsFromState,
+ computeModelCostsFromState,
+} from "../packages/core/src/aggregate-consumers.js";
+import { DailyAccumulator } from "../packages/core/src/aggregates-store.js";
+import { createRecord } from "../packages/core/src/parsers/utils.js";
+import { computeStatbarSignals } from "../packages/core/src/signals.js";
+const out = resolve("docs/assets/demo");
+mkdirSync(out, { recursive: true });
+const now = new Date(2026, 8, 6, 12).getTime();
+const records = [
+ createRecord({
+ timestamp: now - 60000,
+ provider: "codex",
+ model: "gpt-6-astra",
+ project: "sample-api",
+ inputTokens: 20000,
+ cacheReadTokens: 600000,
+ outputTokens: 4000,
+ reasoningTokens: 1000,
+ cost: 1.05,
+ }),
+ createRecord({
+ timestamp: now - 30000,
+ provider: "claude-code",
+ model: "claude-sonnet-4-6",
+ project: "sample-web",
+ inputTokens: 20000,
+ cacheReadTokens: 300000,
+ outputTokens: 30000,
+ cost: 1,
+ usage: { cost: "calculated" },
+ }),
+];
+const missing = createRecord({
+ timestamp: now - 10000,
+ provider: "codex",
+ model: "new-model",
+ project: "sample-api",
+ inputTokens: 40000,
+ outputTokens: 10000,
+ usage: { cost: "not_exposed" },
+});
+const reported = createRecord({
+ timestamp: now - 5000,
+ provider: "cursor",
+ model: "tool-reported-model",
+ project: "sample-web",
+ inputTokens: 20000,
+ outputTokens: 5000,
+ cost: 0.4,
+ usage: { cost: "direct" },
+});
+const scenes = [
+ { caption: "Your day starts with a clear usage view", records: [] },
+ { caption: "See today's models and projects", records },
+ { caption: "Missing prices stay unavailable", records: [...records, missing] },
+ { caption: "Tool reports stay separate from estimates", records: [...records, reported] },
+];
+const snapshots = scenes.map((scene) => {
+ const acc = new DailyAccumulator("2026-09-06");
+ acc.foldAll(scene.records);
+ return {
+ caption: scene.caption,
+ tokens: scene.records.reduce(
+ (n, r) =>
+ n +
+ r.inputTokens +
+ r.outputTokens +
+ r.cacheReadTokens +
+ r.cacheWriteTokens +
+ r.reasoningTokens,
+ 0
+ ),
+ signals: computeStatbarSignals(scene.records, now),
+ models: computeModelCostsFromState(new Map(), acc, {}),
+ projects: computeAllProjectsFromState(new Map(), acc, {}),
+ };
+});
+writeFileSync(resolve(out, "snapshots.json"), `${JSON.stringify(snapshots, null, 2)}\n`);
+console.log(`Wrote ${snapshots.length} synthetic scenes. No provider or user-data access.`);
diff --git a/scripts/prepare-license-materials.py b/scripts/prepare-license-materials.py
new file mode 100644
index 0000000..25f25a7
--- /dev/null
+++ b/scripts/prepare-license-materials.py
@@ -0,0 +1,76 @@
+#!/usr/bin/env python3
+"""Attach license texts and local build source to distributable artifacts."""
+
+import argparse
+import shutil
+import sys
+import tarfile
+from pathlib import Path
+
+ROOT = Path(__file__).resolve().parent.parent
+
+
+def source_files():
+ # Explicit source/build inputs only: never sweep the working directory,
+ # credentials, local usage, personal notes, or generated build trees.
+ files = set()
+ for name in ("LICENSE", "README.md", "CHANGELOG.md", "package.json", "bun.lock",
+ "tsconfig.base.json", "biome.json", "vitest.config.ts",
+ "docs/licensing.md"):
+ path = ROOT / name
+ if path.is_file():
+ files.add(path)
+ for path in (ROOT / "scripts").iterdir():
+ if path.suffix in (".sh", ".ts", ".py"):
+ files.add(path)
+ for package in (ROOT / "packages").iterdir():
+ if not package.is_dir():
+ continue
+ for directory in ("src", "Sources", "Tests", "scripts"):
+ base = package / directory
+ if base.exists():
+ for path in base.rglob("*"):
+ if path.is_file() and path.suffix in (
+ ".ts", ".tsx", ".swift", ".json", ".css", ".html", ".svg", ".sh", ".py"
+ ):
+ files.add(path)
+ for pattern in ("package.json", "tsconfig*.json", "vite.config.*", "index.html",
+ "LICENSE", "README.md", "Package.swift", "Package.resolved",
+ "*.sh", "entitlements.plist", "AppIcon.icns"):
+ files.update(path for path in package.glob(pattern) if path.is_file())
+ for path in sorted(files):
+ if path.is_symlink():
+ raise RuntimeError(f"Source input must not be a symlink: {path.relative_to(ROOT)}")
+ yield path
+
+
+def prepare(destination, sparkle_license=None):
+ destination.mkdir(parents=True, exist_ok=True)
+ shutil.copyfile(ROOT / "LICENSE", destination / "AGPL-3.0-only.txt")
+ shutil.copyfile(ROOT / "packages/core/LICENSE", destination / "MPL-2.0.txt")
+ shutil.copyfile(ROOT / "docs/licensing.md", destination / "README.md")
+ if sparkle_license is not None:
+ if not sparkle_license.is_file():
+ raise RuntimeError("The bundled Sparkle artifact must supply its LICENSE")
+ shutil.copyfile(sparkle_license, destination / "Sparkle.txt")
+ with tarfile.open(destination / "tokmeter-source.tar.gz", "w:gz") as archive:
+ for path in source_files():
+ archive.add(path, arcname=Path("tokmeter-source") / path.relative_to(ROOT), recursive=False)
+ print(f"License texts and source prepared: {destination.relative_to(ROOT) if destination.is_relative_to(ROOT) else destination}", file=sys.stderr)
+
+
+if __name__ == "__main__":
+ parser = argparse.ArgumentParser(description=__doc__)
+ parser.add_argument("mode", choices=("npm", "macos"))
+ parser.add_argument("--destination", type=Path)
+ args = parser.parse_args()
+ if args.mode == "npm":
+ for package in ("tokmeter", "mcp"):
+ dist = ROOT / "packages" / package / "dist"
+ if not dist.is_dir():
+ raise RuntimeError(f"Build {package} before preparing its licenses")
+ prepare(dist / "licenses")
+ else:
+ if args.destination is None:
+ parser.error("macos requires --destination")
+ prepare(args.destination.resolve(), ROOT / "packages/macos-bar/.build/artifacts/sparkle/Sparkle/LICENSE")
diff --git a/scripts/prepare-packages.sh b/scripts/prepare-packages.sh
new file mode 100644
index 0000000..730039f
--- /dev/null
+++ b/scripts/prepare-packages.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Create reviewable npm artifacts without publishing. Run bun run build first.
+set -euo pipefail
+cd "$(dirname "$0")/.."
+candidate_dir="${1:-/tmp/tokmeter-candidate}"
+mkdir -p "$candidate_dir"
+candidate_dir="$(cd "$candidate_dir" && pwd)"
+python3 scripts/prepare-license-materials.py npm
+for package in tokmeter mcp; do
+ version="$(node -p "require('./packages/$package/package.json').version")"
+ artifact="$candidate_dir/$package-$version.tgz"
+ [[ -d "packages/$package/dist" ]] || { echo "Missing build for $package" >&2; exit 1; }
+ (cd "packages/$package" && bun pm pack --filename "$artifact" --ignore-scripts --quiet)
+ # Bun resolves workspace:* to the actual release version. Verify that the
+ # tarball is installable by npm before a release can publish it.
+ tar -xOf "$artifact" package/package.json | node -e '
+ let input="";
+ process.stdin.on("data",d=>input+=d).on("end",()=>{
+ const p=JSON.parse(input);
+ for(const section of ["dependencies","optionalDependencies","peerDependencies"])
+ for(const [name,version] of Object.entries(p[section]??{}))
+ if(version.startsWith("workspace:")) throw new Error(`Unresolved workspace dependency: ${name}`);
+ console.log(`Verified ${p.name}@${p.version}`);
+ });'
+done
diff --git a/scripts/release.sh b/scripts/release.sh
index 612557d..ab3aeb0 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -105,11 +105,13 @@ fi
if [[ $SKIP_NPM -eq 0 ]]; then
say "8/10 npm publish"
if confirm "Publish public packages to npm?"; then
- for pj in packages/*/package.json; do
- node -e 'process.exit(JSON.parse(require("fs").readFileSync(process.argv[1])).private?0:1)' "$pj" && continue
- name="$(node -e 'console.log(JSON.parse(require("fs").readFileSync(process.argv[1])).name)' "$pj")"
- echo " → $name"
- run "(cd '$(dirname "$pj")' && npm publish --access public)"
+ # Pack with Bun first so workspace:* dependencies become installable
+ # semver ranges. npm publish directly from a workspace does not do this.
+ candidate_dir="${TMPDIR:-/tmp}/tokmeter-release-${VERSION}-$$"
+ run "bash scripts/prepare-packages.sh '$candidate_dir'"
+ # Publish the shared core/CLI distribution before the daemon that needs it.
+ for package in tokmeter mcp; do
+ run "npm publish '$candidate_dir/$package-$VERSION.tgz' --access public"
done
else echo " npm publish skipped."; fi
else say "8/10 npm publish — skipped (--skip-npm)"; fi
-
- 
- 
-