Split processUsage types into separate file

Author: chrarnoldus

src/app/admin/api/users/[id]/dev/insert-usage-record/route.ts

@@ -5,8 +5,9 @@ import { randomUUID } from 'crypto';
 import { getUserFromAuth } from '@/lib/user.server';
 import { findUserById } from '@/lib/user';
 import { forceImmediateExpirationRecomputation } from '@/lib/balanceCache';
-import { insertUsageRecord, type UsageMetaData } from '@/lib/processUsage';
+import { insertUsageRecord } from '@/lib/processUsage';
 import type { MicrodollarUsage } from '@kilocode/db/schema';
+import type { UsageMetaData } from '@/lib/processUsage.types';
 
 export async function POST(
   request: NextRequest,

src/app/api/dev/consume-credits/route.ts

@@ -3,9 +3,10 @@ import { NextResponse } from 'next/server';
 import { getUserFromAuth } from '@/lib/user.server';
 import { findUserById } from '@/lib/user';
 import { forceImmediateExpirationRecomputation } from '@/lib/balanceCache';
-import { countAndStoreUsage, type MicrodollarUsageContext } from '@/lib/processUsage';
+import { countAndStoreUsage } from '@/lib/processUsage';
 import { captureException } from '@sentry/nextjs';
 import { getFraudDetectionHeaders } from '@/lib/utils';
+import type { MicrodollarUsageContext } from '@/lib/processUsage.types';
 
 export async function POST(request: NextRequest): Promise<NextResponse> {
   // Check if we're in development mode

src/app/api/fim/completions/route.ts

@@ -3,7 +3,7 @@ import type { NextRequest } from 'next/server';
 import { NextResponse } from 'next/server';
 import z from 'zod';
 import { captureException, setTag, startInactiveSpan } from '@sentry/nextjs';
-import type { MicrodollarUsageContext } from '@/lib/processUsage';
+import type { MicrodollarUsageContext } from '@/lib/processUsage.types';
 import { validateFeatureHeader, FEATURE_HEADER } from '@/lib/feature-detection';
 import { isFreeModel } from '@/lib/models';
 import { sentryRootSpan } from '@/lib/getRootSpan';

src/app/api/openrouter/[...path]/route.ts

@@ -2,7 +2,7 @@ import { NextResponse, type NextResponse as NextResponseType } from 'next/server
 import { type NextRequest } from 'next/server';
 import { isOpenCodeBasedClient, isRooCodeBasedClient, stripRequiredPrefix } from '@/lib/utils';
 import { generateProviderSpecificHash } from '@/lib/providerHash';
-import { extractPromptInfo, type MicrodollarUsageContext } from '@/lib/processUsage';
+import { extractPromptInfo } from '@/lib/processUsage';
 import { validateFeatureHeader, FEATURE_HEADER } from '@/lib/feature-detection';
 import type { OpenRouterChatCompletionRequest } from '@/lib/providers/openrouter/types';
 import { applyProviderSpecificLogic, getProvider, openRouterRequest } from '@/lib/providers';
@@ -60,6 +60,7 @@ import { isRateLimitedToDeath } from '@/lib/rate-limited-models';
 import { isActiveReviewPromo } from '@/lib/code-reviews/core/constants';
 import { isKiloAutoModel, resolveAutoModel } from '@/lib/kilo-auto-model';
 import { fixOpenCodeDuplicateReasoning } from '@/lib/providers/fixOpenCodeDuplicateReasoning';
+import type { MicrodollarUsageContext } from '@/lib/processUsage.types';
 
 export const maxDuration = 800;
 

src/lib/llm-proxy-helpers.ts

@@ -1,12 +1,6 @@
 import { after, NextResponse, type NextRequest } from 'next/server';
 import { FEATURE_HEADER, type FeatureValue } from '@/lib/feature-detection';
-import {
-  type MicrodollarUsageContext,
-  type PromptInfo,
-  type MicrodollarUsageStats,
-  countAndStoreUsage,
-  logMicrodollarUsage,
-} from '@/lib/processUsage';
+import { countAndStoreUsage, logMicrodollarUsage } from '@/lib/processUsage';
 import { startInactiveSpan, captureException, captureMessage } from '@sentry/nextjs';
 import { APP_URL, FIRST_TOPUP_BONUS_AMOUNT } from '@/lib/constants';
 import { summarizeUserPayments } from '@/lib/creditTransactions';
@@ -28,6 +22,11 @@ import type { OpenRouterChatCompletionRequest } from '@/lib/providers/openrouter
 import { createParser, type EventSourceMessage } from 'eventsource-parser';
 import { sentryRootSpan } from './getRootSpan';
 import { isKiloStealthModel, kiloFreeModels } from '@/lib/models';
+import type {
+  MicrodollarUsageContext,
+  MicrodollarUsageStats,
+  PromptInfo,
+} from '@/lib/processUsage.types';
 
 // FIM suffix markers for tracking purposes - used to wrap suffix in a fake system prompt format
 // This allows FIM requests to be tracked consistently with chat requests

src/lib/processUsage.test.ts

@@ -1,5 +1,5 @@
 import { test, describe, expect } from '@jest/globals';
-import type { MicrodollarUsageStats, MicrodollarUsageContext } from './processUsage';
+import type { MicrodollarUsageStats, MicrodollarUsageContext } from './processUsage.types';
 import {
   extractPromptInfo,
   parseMicrodollarUsageFromStream,

src/lib/processUsage.ts

@@ -1,8 +1,7 @@
 import { randomUUID } from 'crypto';
 import { db } from './drizzle';
-import type { MicrodollarUsage, Organization } from '@kilocode/db/schema';
+import type { MicrodollarUsage } from '@kilocode/db/schema';
 import { microdollar_usage } from '@kilocode/db/schema';
-import type { FeatureValue } from '@/lib/feature-detection';
 import { createTimer } from '@/lib/timer';
 import type { OpenAI } from 'openai';
 import { createParser, type EventSourceMessage } from 'eventsource-parser';
@@ -11,7 +10,6 @@ import type {
   OpenRouterGeneration,
 } from './providers/openrouter/types';
 import { fetchGeneration, PROVIDERS } from './providers';
-import type { FraudDetectionHeaders } from './utils';
 import { toMicrodollars } from './utils';
 import { captureException, captureMessage, startSpan, startInactiveSpan } from '@sentry/nextjs';
 import type { Span } from '@sentry/nextjs';
@@ -30,45 +28,24 @@ import { appendKiloPassAuditLog } from '@/lib/kilo-pass/issuance';
 import { KiloPassAuditLogAction, KiloPassAuditLogResult } from '@/lib/kilo-pass/enums';
 import { reportAbuseCost } from '@/lib/abuse-service';
 import { isActiveReviewPromo } from '@/lib/code-reviews/core/constants';
+import type {
+  BalanceUpdateResult,
+  ChatCompletionChunk,
+  CoreUsageWithMetaData,
+  JustTheCostsUsageStats,
+  MaybeHasOpenRouterUsage,
+  MaybeHasVercelProviderMetaData,
+  Message,
+  MicrodollarUsageContext,
+  MicrodollarUsageStats,
+  NotYetCostedUsageStats,
+  OpenRouterError,
+  OpenRouterUsage,
+  UsageMetaData,
+} from '@/lib/processUsage.types';
 
 const posthogClient = PostHogClient();
 
-export type OpenRouterUsage = {
-  cost?: number;
-  is_byok?: boolean | null;
-  cost_details?: { upstream_inference_cost: number };
-  completion_tokens: number;
-  completion_tokens_details: { reasoning_tokens: number };
-  prompt_tokens: number;
-  prompt_tokens_details: { cached_tokens: number };
-  total_tokens: number;
-}; //ref: https://openrouter.ai/docs/use-cases/usage-accounting#response-format
-
-type VercelProviderMetaData = { gateway?: { routing?: { finalProvider?: string } } };
-
-type MaybeHasVercelProviderMetaData = {
-  choices?: {
-    message?: {
-      provider_metadata?: VercelProviderMetaData;
-    };
-  }[];
-};
-
-type MaybeHasVercelProviderMetaDataChunk = {
-  choices?: {
-    delta?: { provider_metadata?: VercelProviderMetaData };
-  }[];
-};
-
-type MaybeHasOpenRouterUsage = {
-  usage?: OpenRouterUsage | null;
-  provider?: string | null;
-};
-
-export type ChatCompletionChunk = OpenAI.Chat.Completions.ChatCompletionChunk &
-  MaybeHasOpenRouterUsage &
-  MaybeHasVercelProviderMetaDataChunk;
-
 // For BYOK (Bring Your Own Key) requests, OpenRouter only reports 5% of the actual cost
 // because that's what they charge for the BYOK feature. Although we now use upstream_inference_cost, we still do some sanity checks.
 const OPENROUTER_BYOK_COST_MULTIPLIER = 20.0;
@@ -104,12 +81,6 @@ export function extractPromptInfo(body: OpenRouterChatCompletionRequest) {
   }
 }
 
-interface Message {
-  role: string;
-  content?: string | { type?: string; text?: string }[];
-  parts?: { text?: string }[];
-}
-
 const extractMessageTextContent = (m: Message) =>
   typeof m.content === 'string'
     ? m.content
@@ -120,76 +91,8 @@ const extractMessageTextContent = (m: Message) =>
           .join('\n')
       : '';
 
-type NotYetCostedUsageStats = {
-  messageId: string | null;
-  model: string | null;
-  responseContent: string;
-  hasError: boolean;
-  inference_provider: string | null;
-  upstream_id: string | null;
-  finish_reason: string | null;
-  latency: number | null;
-  moderation_latency: number | null;
-  generation_time: number | null;
-  streamed: boolean | null;
-  cancelled: boolean | null;
-};
-
-type JustTheCostsUsageStats = {
-  cost_mUsd: number;
-  cacheDiscount_mUsd?: number;
-  /** The real cost before any free/BYOK/promo zeroing. Set by processTokenData. */
-  market_cost?: number;
-  inputTokens: number;
-  outputTokens: number;
-  cacheWriteTokens: number;
-  cacheHitTokens: number;
-  is_byok: boolean | null;
-};
-
-export type MicrodollarUsageStats = NotYetCostedUsageStats & JustTheCostsUsageStats;
-
-export type PromptInfo = {
-  system_prompt_prefix: string;
-  system_prompt_length: number;
-  user_prompt_prefix: string;
-};
-
-export type MicrodollarUsageContext = {
-  kiloUserId: string;
-  fraudHeaders: FraudDetectionHeaders;
-  organizationId?: Organization['id'];
-  provider: ProviderId;
-  requested_model: string;
-  promptInfo: PromptInfo;
-  max_tokens: number | null;
-  has_middle_out_transform: boolean | null;
-  isStreaming: boolean;
-  prior_microdollar_usage: number;
-  /** User email for authenticated users - used as PostHog distinctId. Undefined for anonymous users. */
-  posthog_distinct_id?: string;
-  project_id: string | null;
-  status_code: number | null;
-  editor_name: string | null;
-  machine_id: string | null;
-  /** True if user/org is using their own API key - cost should be zeroed out */
-  user_byok: boolean;
-  has_tools: boolean;
-  botId?: string;
-  tokenSource?: string;
-  /** Request ID from abuse service classify response, for cost tracking correlation. 0 means skip. */
-  abuse_request_id?: number;
-  /** Which product feature generated this API call. NULL if header not sent. */
-  feature: FeatureValue | null;
-  /** Client session/task identifier from X-KiloCode-TaskId header. */
-  session_id: string | null;
-  /** Client mode from x-kilocode-mode header (e.g. 'code', 'build', 'architect'). */
-  mode: string | null;
-  /** The auto model ID when one was requested (e.g. 'kilo-auto/free'). */
-  auto_model: string | null;
-};
-
 export type UsageContextInfo = ReturnType<typeof extractUsageContextInfo>;
+
 export function extractUsageContextInfo(usageContext: MicrodollarUsageContext) {
   return {
     kilo_user_id: usageContext.kiloUserId,
@@ -213,11 +116,6 @@ export function extractUsageContextInfo(usageContext: MicrodollarUsageContext) {
   };
 }
 
-export type CoreUsageWithMetaData = {
-  core: MicrodollarUsage;
-  metadata: UsageMetaData;
-};
-
 export function toInsertableDbUsageRecord(
   usageStats: MicrodollarUsageStats,
   usageContextInfo: UsageContextInfo
@@ -344,8 +242,6 @@ async function sendFirstUsageEvent(usage: MicrodollarUsage, posthog_distinct_id:
   }
 }
 
-type BalanceUpdateResult = { newMicrodollarsUsed: number } | null;
-
 async function sendFirstMicrodollarUsageEventIfNeeded(
   balanceUpdateResult: BalanceUpdateResult,
   usage: MicrodollarUsage,
@@ -414,42 +310,6 @@ ${metaDataKindName}_cte AS (
   SELECT ${metaDataKindName}_id FROM ${metaDataKindName}_ins
 )`;
 
-export type UsageMetaData = {
-  id: string;
-  message_id: string;
-  created_at: string;
-  http_x_forwarded_for: string | null;
-  http_x_vercel_ip_city: string | null;
-  http_x_vercel_ip_country: string | null;
-  http_x_vercel_ip_latitude: number | null;
-  http_x_vercel_ip_longitude: number | null;
-  http_x_vercel_ja4_digest: string | null;
-  user_prompt_prefix: string | null;
-  system_prompt_prefix: string | null;
-  system_prompt_length: number | null;
-  http_user_agent: string | null;
-  max_tokens: number | null;
-  has_middle_out_transform: boolean | null;
-  status_code: number | null;
-  upstream_id: string | null;
-  finish_reason: string | null;
-  latency: number | null;
-  moderation_latency: number | null;
-  generation_time: number | null;
-  is_byok: boolean | null;
-  is_user_byok: boolean;
-  streamed: boolean | null;
-  cancelled: boolean | null;
-  editor_name: string | null;
-  has_tools: boolean | null;
-  machine_id: string | null;
-  feature: string | null;
-  session_id: string | null;
-  mode: string | null;
-  auto_model: string | null;
-  market_cost: number | null;
-};
-
 export async function insertUsageRecord(
   coreUsageFields: MicrodollarUsage,
   metadataFields: UsageMetaData
@@ -684,13 +544,6 @@ export function countAndStoreUsage(
   return usageStatsPromise.then(usageStats => processTokenData(usageStats, usageContext));
 }
 
-type OpenRouterError = {
-  message: string;
-  code: string;
-  metadata?: Record<string, unknown>;
-  provider_name?: string;
-};
-
 export function processOpenRouterUsage(
   usage: OpenRouterUsage | null | undefined,
   coreProps: NotYetCostedUsageStats