@tokenbuddy/tokenbuddy 1.0.31 → 1.0.34

package/dist/src/provider-routing-config.js

@@ -0,0 +1,292 @@
+export const PROVIDER_MODE_CONFIG_KEY = "provider-mode";
+export const MANUAL_PROVIDER_CONFIG_KEY = "manual-providers";
+export const AUTO_PROVIDER_CONFIG_KEY = "auto-provider";
+export const MANUAL_PROVIDER_OBSERVATIONS_CONFIG_KEY = "manual-provider-observations";
+const VALID_PROTOCOLS = new Set(["chat_completions", "responses", "messages"]);
+const VALID_SCORERS = new Set(["balanced", "speed", "discount"]);
+export function defaultProviderModeConfig(now = new Date().toISOString()) {
+    return {
+        mode: "manual",
+        updatedAt: now
+    };
+}
+export function normalizeProviderModeConfig(value, now = new Date().toISOString()) {
+    if (!isRecord(value)) {
+        return defaultProviderModeConfig(now);
+    }
+    return {
+        mode: readProviderMode(value.mode),
+        updatedAt: readOptionalString(value.updatedAt) ?? now
+    };
+}
+export function normalizeManualProvidersConfig(value, now = new Date().toISOString()) {
+    if (!isRecord(value)) {
+        return {
+            version: 1,
+            providers: [],
+            routing: defaultManualProviderRoutingConfig(),
+            updatedAt: now
+        };
+    }
+    const providersValue = Array.isArray(value.providers) ? value.providers : [];
+    const seen = new Set();
+    const providers = providersValue.map((providerValue) => {
+        const provider = normalizeManualProviderConfig(providerValue, { now });
+        if (seen.has(provider.id)) {
+            throw new Error(`manual provider id is duplicated: ${provider.id}`);
+        }
+        seen.add(provider.id);
+        return provider;
+    });
+    return {
+        version: 1,
+        providers,
+        routing: normalizeManualProviderRoutingConfig(value.routing),
+        updatedAt: readOptionalString(value.updatedAt) ?? now
+    };
+}
+export function defaultManualProviderRoutingConfig() {
+    return {
+        policy: "fallback"
+    };
+}
+export function normalizeManualProviderRoutingConfig(value) {
+    if (!isRecord(value)) {
+        return defaultManualProviderRoutingConfig();
+    }
+    const policy = readManualProviderRoutingPolicy(value.policy);
+    const lockedProviderId = readOptionalString(value.lockedProviderId);
+    if (policy === "locked" && !lockedProviderId) {
+        throw new Error("manual provider locked routing requires lockedProviderId");
+    }
+    return {
+        policy,
+        lockedProviderId: policy === "locked" ? readProviderId(lockedProviderId) : undefined
+    };
+}
+export function normalizeManualProviderConfig(value, options = {}) {
+    if (!isRecord(value)) {
+        throw new Error("manual provider config must be an object");
+    }
+    if ("apiKey" in value) {
+        throw new Error("manual provider config must not contain a raw apiKey; use apiKeyEnv or secretRef");
+    }
+    const now = options.now ?? new Date().toISOString();
+    const id = readProviderId(options.id ?? value.id);
+    if (options.existingIds?.has(id)) {
+        throw new Error(`manual provider id is duplicated: ${id}`);
+    }
+    const apiKeyEnv = readOptionalString(value.apiKeyEnv);
+    const secretRef = readOptionalString(value.secretRef);
+    if (!apiKeyEnv && !secretRef) {
+        throw new Error("manual provider requires apiKeyEnv or secretRef");
+    }
+    if (apiKeyEnv && !/^[A-Za-z_][A-Za-z0-9_]*$/.test(apiKeyEnv)) {
+        throw new Error("manual provider apiKeyEnv must be a valid environment variable name");
+    }
+    return {
+        id,
+        name: readRequiredString(value.name, "manual provider name"),
+        kind: readManualProviderKind(value.kind),
+        baseUrl: normalizeProviderBaseUrl(value.baseUrl),
+        apiKeyEnv,
+        secretRef,
+        models: readNonEmptyStringList(value.models, "manual provider models"),
+        supportedProtocols: readProtocols(value.supportedProtocols),
+        enabled: value.enabled === undefined ? true : value.enabled === true,
+        notes: readOptionalString(value.notes),
+        createdAt: readOptionalString(value.createdAt) ?? now,
+        updatedAt: now
+    };
+}
+export function normalizeAutoProviderConfig(value, now = new Date().toISOString()) {
+    if (!isRecord(value)) {
+        return defaultAutoProviderConfig(now);
+    }
+    return {
+        enabled: value.enabled === true,
+        range: readAutoProviderRange(value.range),
+        scorer: readScorer(value.scorer),
+        modelIds: readStringList(value.modelIds),
+        sellerIds: readStringList(value.sellerIds),
+        maxConcurrentProviders: 10,
+        updatedAt: readOptionalString(value.updatedAt) ?? now
+    };
+}
+export function defaultAutoProviderConfig(now = new Date().toISOString()) {
+    return {
+        enabled: false,
+        range: "recommended",
+        scorer: "balanced",
+        modelIds: [],
+        sellerIds: [],
+        maxConcurrentProviders: 10,
+        updatedAt: now
+    };
+}
+export function normalizeManualProviderObservationsConfig(value, now = new Date().toISOString()) {
+    if (!isRecord(value)) {
+        return {
+            version: 1,
+            observations: [],
+            updatedAt: now
+        };
+    }
+    const observationsValue = Array.isArray(value.observations) ? value.observations : [];
+    const seen = new Set();
+    const observations = observationsValue
+        .filter(isRecord)
+        .map((entry) => normalizeManualProviderObservation(entry, now))
+        .filter((entry) => {
+        if (seen.has(entry.providerId)) {
+            return false;
+        }
+        seen.add(entry.providerId);
+        return true;
+    });
+    return {
+        version: 1,
+        observations,
+        updatedAt: readOptionalString(value.updatedAt) ?? now
+    };
+}
+export function publicManualProviderConfig(provider, observation, env = process.env) {
+    const keyRef = provider.apiKeyEnv
+        ? { kind: "env", name: provider.apiKeyEnv, configured: Boolean(env[provider.apiKeyEnv]) }
+        : provider.secretRef
+            ? { kind: "secret", name: provider.secretRef, configured: true }
+            : undefined;
+    const { apiKeyEnv: _apiKeyEnv, secretRef: _secretRef, ...publicProvider } = provider;
+    return {
+        ...publicProvider,
+        keyRef,
+        current: observation?.current,
+        lastAccess: observation?.lastAccess,
+        status: observation?.status,
+        errorClass: observation?.errorClass,
+        errorMessage: observation?.errorMessage,
+        ttftMs: observation?.ttftMs,
+        avgTokensPerSecond: observation?.avgTokensPerSecond
+    };
+}
+function normalizeManualProviderObservation(value, now) {
+    return {
+        providerId: readRequiredString(value.providerId, "manual provider observation providerId"),
+        current: value.current === true,
+        lastAccess: readOptionalString(value.lastAccess) ?? now,
+        status: readObservationStatus(value.status),
+        errorClass: readOptionalString(value.errorClass),
+        errorMessage: readOptionalString(value.errorMessage),
+        ttftMs: readOptionalNumber(value.ttftMs),
+        avgTokensPerSecond: readOptionalNumber(value.avgTokensPerSecond)
+    };
+}
+function readObservationStatus(value) {
+    if (value === "healthy" || value === "degraded" || value === "unhealthy" || value === "unknown") {
+        return value;
+    }
+    return "unknown";
+}
+function readProviderMode(value) {
+    if (value === "manual" || value === "auto") {
+        return value;
+    }
+    throw new Error("provider mode must be manual or auto");
+}
+function readManualProviderRoutingPolicy(value) {
+    if (value === undefined || value === null || value === "" || value === "fallback") {
+        return "fallback";
+    }
+    if (value === "locked") {
+        return "locked";
+    }
+    throw new Error("manual provider routing policy must be fallback or locked");
+}
+function readManualProviderKind(value) {
+    if (value === undefined || value === null || value === "" || value === "openai-compatible") {
+        return "openai-compatible";
+    }
+    throw new Error("manual provider kind must be openai-compatible");
+}
+function readAutoProviderRange(value) {
+    if (value === undefined || value === null || value === "" || value === "recommended") {
+        return "recommended";
+    }
+    if (value === "custom") {
+        return "custom";
+    }
+    throw new Error("auto provider range must be recommended or custom");
+}
+function readScorer(value) {
+    if (value === undefined || value === null || value === "") {
+        return "balanced";
+    }
+    if (typeof value === "string" && VALID_SCORERS.has(value)) {
+        return value;
+    }
+    throw new Error("auto provider scorer must be balanced, speed, or discount");
+}
+function readProtocols(value) {
+    const protocols = readStringList(value);
+    if (protocols.length === 0) {
+        return ["chat_completions"];
+    }
+    const invalid = protocols.find((protocol) => !VALID_PROTOCOLS.has(protocol));
+    if (invalid) {
+        throw new Error(`manual provider protocol is invalid: ${invalid}`);
+    }
+    return protocols;
+}
+function normalizeProviderBaseUrl(value) {
+    const raw = readRequiredString(value, "manual provider baseUrl");
+    let parsed;
+    try {
+        parsed = new URL(raw);
+    }
+    catch {
+        throw new Error("manual provider baseUrl must be a valid URL");
+    }
+    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+        throw new Error("manual provider baseUrl must use http or https");
+    }
+    return parsed.toString().replace(/\/+$/, "");
+}
+function readProviderId(value) {
+    const id = readRequiredString(value, "manual provider id");
+    if (!/^[A-Za-z0-9][A-Za-z0-9_-]{1,63}$/.test(id)) {
+        throw new Error("manual provider id must be 2-64 characters of letters, numbers, underscore, or dash");
+    }
+    return id;
+}
+function readRequiredString(value, label) {
+    if (typeof value !== "string" || value.trim().length === 0) {
+        throw new Error(`${label} is required`);
+    }
+    return value.trim();
+}
+function readOptionalString(value) {
+    return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
+}
+function readOptionalNumber(value) {
+    return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
+function readNonEmptyStringList(value, label) {
+    const entries = readStringList(value);
+    if (entries.length === 0) {
+        throw new Error(`${label} must contain at least one value`);
+    }
+    return entries;
+}
+function readStringList(value) {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+    return value
+        .filter((entry) => typeof entry === "string")
+        .map((entry) => entry.trim())
+        .filter((entry, index, all) => entry.length > 0 && all.indexOf(entry) === index);
+}
+function isRecord(value) {
+    return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+//# sourceMappingURL=provider-routing-config.js.map

package/dist/src/provider-routing-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-routing-config.js","sourceRoot":"","sources":["../../src/provider-routing-config.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenbuddy/tokenbuddy",
-  "version": "1.0.31",
+  "version": "1.0.34",
   "description": "TokenBuddy Client CLI and Daemon",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

package/src/buyer-store.ts

@@ -64,6 +64,9 @@ export interface PurchaseLedgerInput {
   status: string;
   creditMicros: number;
   currency: string;
+  paymentAmount?: string;
+  paymentAmountMinor?: number;
+  paymentCurrency?: string;
   paymentReference?: string;
   completedAt?: string;
 }
@@ -80,6 +83,9 @@ export interface SafePurchaseLedgerEntry {
   status: string;
   creditMicros: number;
   currency: string;
+  paymentAmount?: string;
+  paymentAmountMinor?: number;
+  paymentCurrency?: string;
   paymentReferenceHash?: string;
   createdAt: string;
   completedAt?: string;
@@ -106,11 +112,21 @@ export interface InferenceLedgerInput {
   status: string;
   promptTokens: number;
   completionTokens: number;
+  cacheReadTokens?: number;
   billedMicros: number;
   estimatedMicros?: number;
   settledMicros?: number;
   settledUsdMicros?: number;
   priceVersion?: string;
+  inputPriceMicrosPer1m?: number;
+  outputPriceMicrosPer1m?: number;
+  cacheReadPriceMicrosPer1m?: number;
+  inputCostMicros?: number;
+  outputCostMicros?: number;
+  cacheReadCostMicros?: number;
+  originalUsdMicros?: number;
+  billingMultiplier?: number;
+  serviceTier?: string;
   balanceSnapshotMicros?: number;
   balanceSource?: string;
   prompt?: string;
@@ -136,11 +152,21 @@ export interface SafeInferenceLedgerEntry {
   status: string;
   promptTokens: number;
   completionTokens: number;
+  cacheReadTokens: number;
   billedMicros: number;
   estimatedMicros?: number;
   settledMicros?: number;
   settledUsdMicros?: number;
   priceVersion?: string;
+  inputPriceMicrosPer1m?: number;
+  outputPriceMicrosPer1m?: number;
+  cacheReadPriceMicrosPer1m?: number;
+  inputCostMicros?: number;
+  outputCostMicros?: number;
+  cacheReadCostMicros?: number;
+  originalUsdMicros?: number;
+  billingMultiplier?: number;
+  serviceTier?: string;
   balanceSnapshotMicros?: number;
   balanceSource?: string;
   promptHash?: string;
@@ -609,8 +635,9 @@ export class BuyerStore {
     this.db.prepare(
       `INSERT INTO purchase_ledger (
         purchase_id, seller_key, model_id, payment_method, status, credit_micros,
-        currency, payment_reference_hash, created_at, completed_at
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        currency, payment_amount, payment_amount_minor, payment_currency,
+        payment_reference_hash, created_at, completed_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
     ).run(
       input.purchaseId,
       input.sellerKey,
@@ -619,6 +646,9 @@ export class BuyerStore {
       input.status,
       input.creditMicros,
       input.currency,
+      input.paymentAmount ?? null,
+      input.paymentAmountMinor ?? null,
+      input.paymentCurrency ?? null,
       safeHash(input.paymentReference) || null,
       createdAt,
       input.completedAt || null
@@ -628,7 +658,8 @@ export class BuyerStore {
   public listPurchaseLedger(): SafePurchaseLedgerEntry[] {
     const rows = this.db.prepare(
       `SELECT purchase_id, seller_key, model_id, payment_method, status, credit_micros,
-              currency, payment_reference_hash, created_at, completed_at
+              currency, payment_amount, payment_amount_minor, payment_currency,
+              payment_reference_hash, created_at, completed_at
        FROM purchase_ledger
        ORDER BY id ASC`
     ).all() as Array<{
@@ -639,6 +670,9 @@ export class BuyerStore {
       status: string;
       credit_micros: number;
       currency: string;
+      payment_amount: string | null;
+      payment_amount_minor: number | null;
+      payment_currency: string | null;
       payment_reference_hash: string | null;
       created_at: string;
       completed_at: string | null;
@@ -652,6 +686,9 @@ export class BuyerStore {
       status: row.status,
       creditMicros: row.credit_micros,
       currency: row.currency,
+      paymentAmount: row.payment_amount || undefined,
+      paymentAmountMinor: row.payment_amount_minor ?? undefined,
+      paymentCurrency: row.payment_currency || undefined,
       paymentReferenceHash: row.payment_reference_hash || undefined,
       createdAt: row.created_at,
       completedAt: row.completed_at || undefined
@@ -662,12 +699,16 @@ export class BuyerStore {
     this.db.prepare(
       `INSERT INTO inference_ledger (
         request_id, seller_key, model_id, endpoint, status, prompt_tokens,
-        completion_tokens, billed_micros, estimated_micros, settled_micros,
-        settled_usd_micros, price_version, balance_snapshot_micros, balance_source,
+        completion_tokens, cache_read_tokens, billed_micros, estimated_micros, settled_micros,
+        settled_usd_micros, price_version,
+        input_price_micros_per_1m, output_price_micros_per_1m, cache_read_price_micros_per_1m,
+        input_cost_micros, output_cost_micros, cache_read_cost_micros,
+        original_usd_micros, billing_multiplier, service_tier,
+        balance_snapshot_micros, balance_source,
         prompt_hash, response_hash, created_at,
         ttft_ms, fallback_count, route_reason, fallover_chain_json, upstream_status,
         duration_ms, payment_method
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
     ).run(
       input.requestId,
       input.sellerKey,
@@ -676,11 +717,21 @@ export class BuyerStore {
       input.status,
       input.promptTokens,
       input.completionTokens,
+      input.cacheReadTokens ?? 0,
       input.billedMicros,
       input.estimatedMicros ?? input.billedMicros,
       input.settledMicros ?? null,
       input.settledUsdMicros ?? null,
       input.priceVersion || null,
+      input.inputPriceMicrosPer1m ?? null,
+      input.outputPriceMicrosPer1m ?? null,
+      input.cacheReadPriceMicrosPer1m ?? null,
+      input.inputCostMicros ?? null,
+      input.outputCostMicros ?? null,
+      input.cacheReadCostMicros ?? null,
+      input.originalUsdMicros ?? null,
+      input.billingMultiplier ?? null,
+      input.serviceTier ?? null,
       input.balanceSnapshotMicros ?? null,
       input.balanceSource || "unknown",
       safeHash(input.prompt) || null,
@@ -699,8 +750,12 @@ export class BuyerStore {
   public listInferenceLedger(): SafeInferenceLedgerEntry[] {
     const rows = this.db.prepare(
       `SELECT request_id, seller_key, model_id, endpoint, status, prompt_tokens,
-              completion_tokens, billed_micros, estimated_micros, settled_micros,
-              settled_usd_micros, price_version, balance_snapshot_micros, balance_source,
+              completion_tokens, cache_read_tokens, billed_micros, estimated_micros, settled_micros,
+              settled_usd_micros, price_version,
+              input_price_micros_per_1m, output_price_micros_per_1m, cache_read_price_micros_per_1m,
+              input_cost_micros, output_cost_micros, cache_read_cost_micros,
+              original_usd_micros, billing_multiplier, service_tier,
+              balance_snapshot_micros, balance_source,
               prompt_hash, response_hash, created_at,
               ttft_ms, fallback_count, route_reason, fallover_chain_json, upstream_status,
               duration_ms, payment_method
@@ -714,11 +769,21 @@ export class BuyerStore {
       status: string;
       prompt_tokens: number;
       completion_tokens: number;
+      cache_read_tokens: number;
       billed_micros: number;
       estimated_micros: number | null;
       settled_micros: number | null;
       settled_usd_micros: number | null;
       price_version: string | null;
+      input_price_micros_per_1m: number | null;
+      output_price_micros_per_1m: number | null;
+      cache_read_price_micros_per_1m: number | null;
+      input_cost_micros: number | null;
+      output_cost_micros: number | null;
+      cache_read_cost_micros: number | null;
+      original_usd_micros: number | null;
+      billing_multiplier: number | null;
+      service_tier: string | null;
       balance_snapshot_micros: number | null;
       balance_source: string | null;
       prompt_hash: string | null;
@@ -741,11 +806,21 @@ export class BuyerStore {
       status: row.status,
       promptTokens: row.prompt_tokens,
       completionTokens: row.completion_tokens,
+      cacheReadTokens: row.cache_read_tokens,
       billedMicros: row.billed_micros,
       estimatedMicros: row.estimated_micros ?? undefined,
       settledMicros: row.settled_micros ?? undefined,
       settledUsdMicros: row.settled_usd_micros ?? undefined,
       priceVersion: row.price_version || undefined,
+      inputPriceMicrosPer1m: row.input_price_micros_per_1m ?? undefined,
+      outputPriceMicrosPer1m: row.output_price_micros_per_1m ?? undefined,
+      cacheReadPriceMicrosPer1m: row.cache_read_price_micros_per_1m ?? undefined,
+      inputCostMicros: row.input_cost_micros ?? undefined,
+      outputCostMicros: row.output_cost_micros ?? undefined,
+      cacheReadCostMicros: row.cache_read_cost_micros ?? undefined,
+      originalUsdMicros: row.original_usd_micros ?? undefined,
+      billingMultiplier: row.billing_multiplier ?? undefined,
+      serviceTier: row.service_tier || undefined,
       balanceSnapshotMicros: row.balance_snapshot_micros ?? undefined,
       balanceSource: row.balance_source || undefined,
       promptHash: row.prompt_hash || undefined,
@@ -810,6 +885,9 @@ export class BuyerStore {
         status TEXT NOT NULL,
         credit_micros INTEGER NOT NULL,
         currency TEXT NOT NULL,
+        payment_amount TEXT,
+        payment_amount_minor INTEGER,
+        payment_currency TEXT,
         payment_reference_hash TEXT,
         created_at TEXT NOT NULL,
         completed_at TEXT
@@ -824,11 +902,21 @@ export class BuyerStore {
         status TEXT NOT NULL,
         prompt_tokens INTEGER NOT NULL,
         completion_tokens INTEGER NOT NULL,
+        cache_read_tokens INTEGER NOT NULL DEFAULT 0,
         billed_micros INTEGER NOT NULL,
         estimated_micros INTEGER,
         settled_micros INTEGER,
         settled_usd_micros INTEGER,
         price_version TEXT,
+        input_price_micros_per_1m INTEGER,
+        output_price_micros_per_1m INTEGER,
+        cache_read_price_micros_per_1m INTEGER,
+        input_cost_micros INTEGER,
+        output_cost_micros INTEGER,
+        cache_read_cost_micros INTEGER,
+        original_usd_micros INTEGER,
+        billing_multiplier REAL,
+        service_tier TEXT,
         balance_snapshot_micros INTEGER,
         balance_source TEXT,
         prompt_hash TEXT,
@@ -871,11 +959,28 @@ export class BuyerStore {
     ]) {
       this.ensureColumn("token_cache", column, definition);
     }
+    for (const [column, definition] of [
+      ["payment_amount", "TEXT"],
+      ["payment_amount_minor", "INTEGER"],
+      ["payment_currency", "TEXT"]
+    ]) {
+      this.ensureColumn("purchase_ledger", column, definition);
+    }
     for (const [column, definition] of [
       ["estimated_micros", "INTEGER"],
+      ["cache_read_tokens", "INTEGER NOT NULL DEFAULT 0"],
       ["settled_micros", "INTEGER"],
       ["settled_usd_micros", "INTEGER"],
       ["price_version", "TEXT"],
+      ["input_price_micros_per_1m", "INTEGER"],
+      ["output_price_micros_per_1m", "INTEGER"],
+      ["cache_read_price_micros_per_1m", "INTEGER"],
+      ["input_cost_micros", "INTEGER"],
+      ["output_cost_micros", "INTEGER"],
+      ["cache_read_cost_micros", "INTEGER"],
+      ["original_usd_micros", "INTEGER"],
+      ["billing_multiplier", "REAL"],
+      ["service_tier", "TEXT"],
       ["balance_snapshot_micros", "INTEGER"],
       ["balance_source", "TEXT"],
       ["ttft_ms", "INTEGER"],