@robhowley/pi-openrouter 0.9.1 → 0.11.0

package/extensions/openrouter/normalizers.ts

@@ -1,5 +1,11 @@
 import type { Model as SDKModel } from '@openrouter/sdk/models/index.js';
-import type { GetCurrentKeyData, ListData } from '@openrouter/sdk/models/operations/index.js';
+import type {
+  CreateKeysData,
+  GetCurrentKeyData,
+  GetKeyData,
+  ListData,
+  UpdateKeysData,
+} from '@openrouter/sdk/models/operations/index.js';
 import type { BYOKStatus, ResetCadence } from './account-types.js';
 import type { OpenRouterModel } from './models/types.js';
 
@@ -9,7 +15,7 @@ export interface NormalizedKeyMetadata {
   used: number;
   resetCadence: ResetCadence;
   byok: BYOKStatus;
-  hash: string;
+  hash?: string;
   disabled: boolean;
   limit?: number;
   remaining?: number;
@@ -83,7 +89,9 @@ export function normalizeOpenRouterModel(model: OpenRouterModel | SDKModel): Ope
  * Normalize SDK key metadata into the package's canonical internal shape.
  * Converts SDK null/variant fields once so account code can stay domain-focused.
  */
-export function normalizeSdkKeyMetadata(raw: GetCurrentKeyData | ListData): NormalizedKeyMetadata {
+export function normalizeSdkKeyMetadata(
+  raw: GetCurrentKeyData | ListData | GetKeyData | CreateKeysData | UpdateKeysData,
+): NormalizedKeyMetadata {
   const used = raw.usage ?? raw.usageMonthly ?? 0;
   const limit = raw.limit ?? undefined;
   const remaining = raw.limitRemaining ?? undefined;
@@ -96,10 +104,14 @@ export function normalizeSdkKeyMetadata(raw: GetCurrentKeyData | ListData): Norm
   }
 
   let resetCadence: ResetCadence = 'partial';
-  if (raw.limitReset) {
+  if (raw.limitReset === null) {
+    resetCadence = 'never';
+  } else if (raw.limitReset) {
     const reset = raw.limitReset.toLowerCase();
     if (reset === 'monthly') {
       resetCadence = 'monthly';
+    } else if (reset === 'weekly') {
+      resetCadence = 'weekly';
     } else if (reset === 'daily') {
       resetCadence = 'daily';
     } else if (reset === 'never') {
@@ -107,16 +119,21 @@ export function normalizeSdkKeyMetadata(raw: GetCurrentKeyData | ListData): Norm
     }
   }
 
+  const hash =
+    'hash' in raw && typeof raw.hash === 'string' && raw.hash.trim() !== '' ? raw.hash : undefined;
+
   const normalized: NormalizedKeyMetadata = {
     name: 'name' in raw ? (raw as ListData).name : raw.label,
     label: raw.label,
     used,
     resetCadence,
     byok,
-    hash: 'hash' in raw ? (raw as ListData).hash : 'unknown',
     disabled: 'disabled' in raw ? (raw as ListData).disabled : false,
   };
 
+  if (hash !== undefined) {
+    normalized.hash = hash;
+  }
   if (limit !== undefined) {
     normalized.limit = limit;
   }

package/extensions/openrouter/status-bar.ts

@@ -0,0 +1,101 @@
+import {
+  addUtcDays,
+  dedupeLocalUsageEvents,
+  getCurrentUtcDate,
+  getUtcDateFromTimestamp,
+  readLocalUsage,
+} from './local-usage.js';
+import type { LocalUsageEvent } from './types.js';
+
+const STATUS_WINDOW_DAYS = 30;
+const STATUS_WINDOW_LABEL = '30d avg';
+const STATUS_PREFIX = 'OR';
+const STATUS_SEPARATOR = ' · ';
+
+export interface OpenRouterStatusStats {
+  todayLocalSpend: number;
+  averageLocalDailySpendLast30Days: number;
+  burnRateMultiplier: number | null;
+}
+
+export type OpenRouterStatusBarLoadResult =
+  | { kind: 'ready'; text: string }
+  | { kind: 'empty' }
+  | { kind: 'failed' };
+
+function getUtcDateForNow(now?: Date): string {
+  return now ? now.toISOString().slice(0, 10) : getCurrentUtcDate();
+}
+
+export function calculateOpenRouterStatusStats(
+  events: LocalUsageEvent[],
+  nowUtcDate: string = getCurrentUtcDate(),
+): OpenRouterStatusStats | null {
+  const windowStartUtc = addUtcDays(nowUtcDate, -(STATUS_WINDOW_DAYS - 1));
+  const uniqueEvents = dedupeLocalUsageEvents(events);
+
+  let todayLocalSpend = 0;
+  let totalLocalSpendInWindow = 0;
+
+  for (const event of uniqueEvents) {
+    const completedDateUtc = getUtcDateFromTimestamp(event.completedAt);
+    if (completedDateUtc < windowStartUtc || completedDateUtc > nowUtcDate) {
+      continue;
+    }
+
+    const cost = event.cost ?? 0;
+    totalLocalSpendInWindow += cost;
+
+    if (completedDateUtc === nowUtcDate) {
+      todayLocalSpend += cost;
+    }
+  }
+
+  if (totalLocalSpendInWindow <= 0) {
+    return null;
+  }
+
+  const averageLocalDailySpendLast30Days = totalLocalSpendInWindow / STATUS_WINDOW_DAYS;
+
+  return {
+    todayLocalSpend,
+    averageLocalDailySpendLast30Days,
+    burnRateMultiplier:
+      averageLocalDailySpendLast30Days === 0
+        ? null
+        : todayLocalSpend / averageLocalDailySpendLast30Days,
+  };
+}
+
+export function formatOpenRouterStatusBar(stats: OpenRouterStatusStats): string {
+  const today = `${STATUS_PREFIX} $${stats.todayLocalSpend.toFixed(2)} today`;
+  if (stats.burnRateMultiplier === null) {
+    return today;
+  }
+
+  return `${today}${STATUS_SEPARATOR}${stats.burnRateMultiplier.toFixed(1)}x ${STATUS_WINDOW_LABEL}`;
+}
+
+export async function loadOpenRouterStatusStats(now?: Date): Promise<OpenRouterStatusStats | null> {
+  const todayUtc = getUtcDateForNow(now);
+  const fromDateUtc = addUtcDays(todayUtc, -(STATUS_WINDOW_DAYS - 1));
+  const events = await readLocalUsage({ fromDateUtc, toDateUtc: todayUtc });
+
+  return calculateOpenRouterStatusStats(events, todayUtc);
+}
+
+export async function loadOpenRouterStatusBar(now?: Date): Promise<OpenRouterStatusBarLoadResult> {
+  try {
+    const stats = await loadOpenRouterStatusStats(now);
+    if (!stats) {
+      return { kind: 'empty' };
+    }
+
+    return {
+      kind: 'ready',
+      text: formatOpenRouterStatusBar(stats),
+    };
+  } catch {
+    return { kind: 'failed' };
+  }
+}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@robhowley/pi-openrouter",
-  "version": "0.9.1",
+  "version": "0.11.0",
   "type": "module",
-  "description": "Live OpenRouter spend/account TUI overlays, user-scoped model sync, and session tagging for Pi.",
+  "description": "Live OpenRouter spend/account TUI overlays, user-scoped model sync, api key management, and session tagging for Pi.",
   "license": "MIT",
   "files": [
     "extensions",