@tokenbuddy/tokenbuddy 1.0.36 → 1.0.38

package/dist/src/buyer-store.d.ts

@@ -80,13 +80,14 @@ export interface SafePurchaseLedgerEntry {
  * buyer 端单次推理请求的账本输入。
  * `prompt` / `response` 在落库前会 hash，原始内容永不落盘。
  *
- * v1.2 tb-ui v1 (Iter 4):补 7 字段 — 排查 / 性能 / 路由决策溯源必备。
+ * v1.2 tb-ui v1 (Iter 4):补充排查 / 性能 / 路由决策溯源必备字段。
  * - `ttftMs`:首字延迟(从请求发起到首 byte),`forwardProxyRequest` 计算
  * - `fallbackCount`:本请求实际走过的 seller 数(> 1 即发生 failover)
  * - `routeReason`:`planSellerRouteSet().reason`(如 `fullAuto:balanced:routes_3`)
  * - `falloverChain`:failover 路径上 seller id 数组(空 = 主路径成功)
  * - `upstreamStatus`:seller 透传的上游健康状态(`healthy|degraded|unhealthy|unknown`)
  * - `durationMs`:总耗时(req start → response end 或失败)
+ * - `avgOutputTokensPerSecond`:请求级输出速度，按输出窗口统计，不由 UI 现场推导
  * - `paymentMethod`:本请求使用的支付方式(`mock|clawtip`)
  */
 export interface InferenceLedgerInput {
@@ -130,6 +131,7 @@ export interface InferenceLedgerInput {
     falloverChain?: string[];
     upstreamStatus?: string;
     durationMs?: number;
+    avgOutputTokensPerSecond?: number;
     paymentMethod?: string;
 }
 /**
@@ -178,6 +180,7 @@ export interface SafeInferenceLedgerEntry {
     falloverChain?: string[];
     upstreamStatus?: string;
     durationMs?: number;
+    avgOutputTokensPerSecond?: number;
     paymentMethod?: string;
 }
 /**
@@ -248,7 +251,7 @@ export interface BuyerStoreOptions {
 }
 /**
  * 解析 buyer store 的 DB 路径。
- * 优先级：`dbPath` → `TOKENBUDDY_BUYER_STORE` env → `~/.tokenbuddy-store/buyer-store.db`。
+ * 优先级：`dbPath` → `TOKENBUDDY_BUYER_STORE` env → `TB_WORKDIR` env → `~/.config/tokenbuddy/buyer-store.db`。
  *
  * @param options 解析选项
  * @returns DB 文件绝对路径
@@ -292,6 +295,8 @@ export declare class BuyerStore {
     listInferenceLedger(): SafeInferenceLedgerEntry[];
     close(): void;
     private initSchema;
+    private backfillPurchasePaymentAmountsFromPending;
+    private pendingPurchasePaymentSummary;
     private ensureColumn;
     private countRows;
     /**

package/dist/src/buyer-store.js

@@ -2,9 +2,9 @@
 import { DatabaseSync } from "node:sqlite";
 import * as crypto from "crypto";
 import * as fs from "fs";
-import * as os from "os";
 import * as path from "path";
 import { createModuleLogger } from "@tokenbuddy/logging";
+import { resolveTokenBuddyWorkdir } from "./workdir.js";
 const logger = createModuleLogger("tb-proxyd");
 function nowIso() {
     return new Date().toISOString();
@@ -26,7 +26,7 @@ function ensureDirForFile(filePath) {
 }
 /**
  * 解析 buyer store 的 DB 路径。
- * 优先级：`dbPath` → `TOKENBUDDY_BUYER_STORE` env → `~/.tokenbuddy-store/buyer-store.db`。
+ * 优先级：`dbPath` → `TOKENBUDDY_BUYER_STORE` env → `TB_WORKDIR` env → `~/.config/tokenbuddy/buyer-store.db`。
  *
  * @param options 解析选项
  * @returns DB 文件绝对路径
@@ -35,7 +35,7 @@ export function resolveBuyerStorePath(options = {}) {
     if (options.dbPath) {
         return options.dbPath;
     }
-    const root = options.root || process.env.TOKENBUDDY_BUYER_STORE || path.join(os.homedir(), ".tokenbuddy-store");
+    const root = options.root || process.env.TOKENBUDDY_BUYER_STORE || resolveTokenBuddyWorkdir();
     return path.join(root, "buyer-store.db");
 }
 /**
@@ -251,11 +251,12 @@ export class BuyerStore {
     }
     recordPurchaseLedger(input) {
         const createdAt = nowIso();
+        const pendingPayment = this.pendingPurchasePaymentSummary(input.purchaseId);
         this.db.prepare(`INSERT INTO purchase_ledger (
         purchase_id, seller_key, model_id, payment_method, status, credit_micros,
         currency, payment_amount, payment_amount_minor, payment_currency,
         payment_reference_hash, created_at, completed_at
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.purchaseId, input.sellerKey, input.modelId, input.paymentMethod, input.status, input.creditMicros, input.currency, input.paymentAmount ?? null, input.paymentAmountMinor ?? null, input.paymentCurrency ?? null, safeHash(input.paymentReference) || null, createdAt, input.completedAt || null);
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.purchaseId, input.sellerKey, input.modelId, input.paymentMethod, input.status, input.creditMicros, input.currency, input.paymentAmount ?? pendingPayment?.paymentAmount ?? null, input.paymentAmountMinor ?? pendingPayment?.paymentAmountMinor ?? null, input.paymentCurrency ?? pendingPayment?.paymentCurrency ?? null, safeHash(input.paymentReference) || null, createdAt, input.completedAt || null);
     }
     listPurchaseLedger() {
         const rows = this.db.prepare(`SELECT purchase_id, seller_key, model_id, payment_method, status, credit_micros,
@@ -292,8 +293,8 @@ export class BuyerStore {
         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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.requestId, input.sellerKey, input.modelId, input.endpoint, 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.billingUnit ?? (input.endpoint === "/v1/images/generations" ? "images" : "tokens"), input.imageCount ?? null, input.imageSize ?? null, input.imageQuality ?? null, input.imageOutputFormat ?? null, input.imageOutputTokens ?? null, input.imageOutputCostMicros ?? null, input.imageCostMicrosPerImage ?? null, input.balanceSnapshotMicros ?? null, input.balanceSource || "unknown", safeHash(input.prompt) || null, safeHash(input.response) || null, nowIso(), input.ttftMs ?? null, input.fallbackCount ?? null, input.routeReason ?? null, input.falloverChain ? JSON.stringify(input.falloverChain) : null, input.upstreamStatus ?? null, input.durationMs ?? null, input.paymentMethod ?? null);
+        duration_ms, avg_output_tokens_per_second, payment_method
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.requestId, input.sellerKey, input.modelId, input.endpoint, 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.billingUnit ?? (input.endpoint === "/v1/images/generations" ? "images" : "tokens"), input.imageCount ?? null, input.imageSize ?? null, input.imageQuality ?? null, input.imageOutputFormat ?? null, input.imageOutputTokens ?? null, input.imageOutputCostMicros ?? null, input.imageCostMicrosPerImage ?? null, input.balanceSnapshotMicros ?? null, input.balanceSource || "unknown", safeHash(input.prompt) || null, safeHash(input.response) || null, nowIso(), input.ttftMs ?? null, input.fallbackCount ?? null, input.routeReason ?? null, input.falloverChain ? JSON.stringify(input.falloverChain) : null, input.upstreamStatus ?? null, input.durationMs ?? null, input.avgOutputTokensPerSecond ?? null, input.paymentMethod ?? null);
     }
     listInferenceLedger() {
         const rows = this.db.prepare(`SELECT request_id, seller_key, model_id, endpoint, status, prompt_tokens,
@@ -307,7 +308,7 @@ export class BuyerStore {
               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
+              duration_ms, avg_output_tokens_per_second, payment_method
        FROM inference_ledger
        ORDER BY id ASC`).all();
         return rows.map(row => ({
@@ -352,6 +353,7 @@ export class BuyerStore {
             falloverChain: row.fallover_chain_json ? JSON.parse(row.fallover_chain_json) : undefined,
             upstreamStatus: row.upstream_status ?? undefined,
             durationMs: row.duration_ms ?? undefined,
+            avgOutputTokensPerSecond: row.avg_output_tokens_per_second ?? undefined,
             paymentMethod: row.payment_method ?? undefined
         }));
     }
@@ -454,6 +456,7 @@ export class BuyerStore {
         fallover_chain_json TEXT,
         upstream_status TEXT,
         duration_ms INTEGER,
+        avg_output_tokens_per_second REAL,
         payment_method TEXT
       );
 
@@ -523,10 +526,46 @@ export class BuyerStore {
             ["fallover_chain_json", "TEXT"],
             ["upstream_status", "TEXT"],
             ["duration_ms", "INTEGER"],
+            ["avg_output_tokens_per_second", "REAL"],
             ["payment_method", "TEXT"]
         ]) {
             this.ensureColumn("inference_ledger", column, definition);
         }
+        this.backfillPurchasePaymentAmountsFromPending();
+    }
+    backfillPurchasePaymentAmountsFromPending() {
+        this.db.prepare(`UPDATE purchase_ledger
+          SET payment_amount = (
+                SELECT printf('%.4f', pending_purchases.amount_usd_micros / 1000000.0)
+                  FROM pending_purchases
+                 WHERE pending_purchases.purchase_id = purchase_ledger.purchase_id
+              ),
+              payment_amount_minor = (
+                SELECT CAST(ROUND(pending_purchases.amount_usd_micros / 10000.0) AS INTEGER)
+                  FROM pending_purchases
+                 WHERE pending_purchases.purchase_id = purchase_ledger.purchase_id
+              ),
+              payment_currency = 'USD'
+        WHERE (payment_amount IS NULL OR payment_amount = '' OR payment_amount_minor IS NULL OR payment_currency IS NULL OR payment_currency = '')
+          AND EXISTS (
+                SELECT 1
+                  FROM pending_purchases
+                 WHERE pending_purchases.purchase_id = purchase_ledger.purchase_id
+                   AND pending_purchases.amount_usd_micros >= 0
+              )`).run();
+    }
+    pendingPurchasePaymentSummary(purchaseId) {
+        const row = this.db.prepare(`SELECT amount_usd_micros
+         FROM pending_purchases
+        WHERE purchase_id = ?`).get(purchaseId);
+        if (!row || !Number.isFinite(row.amount_usd_micros) || row.amount_usd_micros < 0) {
+            return undefined;
+        }
+        return {
+            paymentAmount: (row.amount_usd_micros / 1_000_000).toFixed(4),
+            paymentAmountMinor: Math.round(row.amount_usd_micros / 10_000),
+            paymentCurrency: "USD"
+        };
     }
     ensureColumn(table, column, definition) {
         const rows = this.db.prepare(`PRAGMA table_info(${table})`).all();

package/dist/src/cli.d.ts

@@ -34,6 +34,7 @@ export interface LaunchdPlistOptions {
     proxyPort: number;
     sellerRegistryUrl: string;
     pathEnv?: string;
+    workdir?: string;
     clawtipProofCommand?: string;
     clawtipProofTimeoutMs?: number;
 }

package/dist/src/cli.js

@@ -6,7 +6,7 @@ import * as os from "os";
 import { execFileSync, spawn } from "child_process";
 import Table from "cli-table3";
 import { BuyerStore } from "./buyer-store.js";
-import { applyProviderInstall, detectProviders, getProviderModelSelectionKind, getProviderProtocolPreference, } from "./provider-install.js";
+import { applyProviderInstall, detectProviders, getProviderModelSelectionKind, getProviderProtocolPreference, PROXY_ACCESS_TOKEN_PLACEHOLDER, } from "./provider-install.js";
 import { createModuleLogger } from "@tokenbuddy/logging";
 import * as crypto from "crypto";
 import { fileURLToPath } from "url";
@@ -19,6 +19,7 @@ import { DEFAULT_CLAWTIP_BOOTSTRAP_URL, fetchClawtipBootstrap, } from "./clawtip
 import { displayTerminalImage } from "./terminal-image.js";
 import { checkPackageUpdate, readInstalledPackageManifest, runPackageUpdate, } from "./package-update.js";
 import { DEFAULT_SELLER_REGISTRY_URL } from "./registry-trust.js";
+import { resolveTokenBuddyWorkdir, resolveTokenBuddyWorkdirPath, TB_WORKDIR_ENV } from "./workdir.js";
 // @ts-ignore
 import qrcode from "qrcode-terminal";
 const CONTROL_PORT = 17820;
@@ -119,7 +120,7 @@ function launchControlUi(controlPort, pathname = "/") {
     return url;
 }
 function defaultProxydLogPath(kind) {
-    const logDir = path.join(os.homedir(), ".tokenbuddy-store");
+    const logDir = resolveTokenBuddyWorkdir();
     fs.mkdirSync(logDir, { recursive: true });
     return path.join(logDir, `tb-proxyd.${kind}.log`);
 }
@@ -164,6 +165,9 @@ export function buildLaunchdPlistContent(options) {
     if (options.clawtipProofCommand?.trim()) {
         env.TB_PROXYD_CLAWTIP_PROOF_COMMAND = options.clawtipProofCommand.trim();
     }
+    if (options.workdir?.trim()) {
+        env[TB_WORKDIR_ENV] = options.workdir.trim();
+    }
     if (options.clawtipProofTimeoutMs !== undefined) {
         env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS = String(options.clawtipProofTimeoutMs);
     }
@@ -383,8 +387,9 @@ export async function runWebInitLauncher(deps = {}) {
     if (platform === "darwin") {
         const plistDir = path.join(home, "Library", "LaunchAgents");
         const plistPath = path.join(plistDir, `${TOKENBUDDY_LAUNCHD_LABEL}.plist`);
-        const stdoutPath = deps.stdoutPath ?? path.join(home, ".tokenbuddy-store", "tb-proxyd.stdout.log");
-        const stderrPath = deps.stderrPath ?? path.join(home, ".tokenbuddy-store", "tb-proxyd.stderr.log");
+        const workdir = resolveTokenBuddyWorkdir({ homeDir: home });
+        const stdoutPath = deps.stdoutPath ?? resolveTokenBuddyWorkdirPath("tb-proxyd.stdout.log", { homeDir: home });
+        const stderrPath = deps.stderrPath ?? resolveTokenBuddyWorkdirPath("tb-proxyd.stderr.log", { homeDir: home });
         try {
             (deps.mkdirSync ?? fs.mkdirSync)(plistDir, { recursive: true });
             (deps.mkdirSync ?? fs.mkdirSync)(path.dirname(stdoutPath), { recursive: true });
@@ -394,6 +399,7 @@ export async function runWebInitLauncher(deps = {}) {
                 nodePath: deps.nodePath ?? process.execPath,
                 scriptPath: deps.scriptPath ?? tbProxydScriptPath(),
                 pathEnv: deps.pathEnv,
+                workdir,
                 stdoutPath,
                 stderrPath,
                 controlPort,
@@ -1511,7 +1517,7 @@ export function buildCli() {
                     "✅ OpenAI-compatible Proxy",
                     "   URL: http://127.0.0.1:17821/v1",
                     "   Probe: http://127.0.0.1:17821/v1/models",
-                    "   Token: TOKENBUDDY_PROXY",
+                    `   Token: ${PROXY_ACCESS_TOKEN_PLACEHOLDER}`,
                     "",
                     "✅ Anthropic-compatible Proxy",
                     "   URL: http://127.0.0.1:17821"
@@ -1799,8 +1805,9 @@ export function buildCli() {
                     const sellerRegistryUrl = sellerRegistryUrlForInit();
                     const nodePath = process.execPath;
                     const scriptPath = tbProxydScriptPath();
-                    const stdoutPath = path.join(home, ".tokenbuddy-store", "tb-proxyd.stdout.log");
-                    const stderrPath = path.join(home, ".tokenbuddy-store", "tb-proxyd.stderr.log");
+                    const workdir = resolveTokenBuddyWorkdir({ homeDir: home });
+                    const stdoutPath = resolveTokenBuddyWorkdirPath("tb-proxyd.stdout.log", { homeDir: home });
+                    const stderrPath = resolveTokenBuddyWorkdirPath("tb-proxyd.stderr.log", { homeDir: home });
                     fs.mkdirSync(path.dirname(stdoutPath), { recursive: true });
                     fs.mkdirSync(path.dirname(stderrPath), { recursive: true });
                     const plistContent = buildLaunchdPlistContent({
@@ -1813,6 +1820,7 @@ export function buildCli() {
                         proxyPort,
                         sellerRegistryUrl,
                         pathEnv: process.env.PATH,
+                        workdir,
                         clawtipProofCommand: defaultClawtipProofCommand(),
                         clawtipProofTimeoutMs: process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS
                             ? Number(process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS)

package/dist/src/daemon.d.ts

@@ -142,6 +142,7 @@ export declare class TokenbuddyDaemon {
     private resolveClaudeRoleModel;
     private resolveRouteModelId;
     private applyResolvedModelToBody;
+    private withOpenAiStreamUsage;
     private defaultPaymentMethod;
     private selectManualProviderRoutes;
     private selectSellerRoutes;
@@ -173,7 +174,11 @@ export declare class TokenbuddyDaemon {
     private sellerCatalogWithRuntimeMetrics;
     private refreshSellerRouteMetadata;
     private routeMetricFromPoolEntry;
+    private routeStateFromPoolEntry;
+    private routeStateFromCatalogStatus;
     private readUsage;
+    private usageSummaryFromData;
+    private readUsageFromSse;
     private parseSellerSettlementSummary;
     private recordReconciledInference;
     private refreshSellerBalance;
@@ -190,6 +195,7 @@ export declare class TokenbuddyDaemon {
      * `TB_PROXYD_REQUEST_DEADLINE_MS` (default 180s).
      */
     private requestDeadlineMs;
+    private userInferenceTestTimeoutMs;
     /**
      * Safety margin subtracted from the cached token's `expiresAt` before
      * deciding to reuse it. Buying a new token 60s before expiry gives the
@@ -206,6 +212,12 @@ export declare class TokenbuddyDaemon {
     private manualProviderEndpointUrl;
     private manualProviderEndpointUrlFromBase;
     private probeManualProviderModels;
+    private probeManualProviderProtocols;
+    private probeManualProviderProtocol;
+    private probeManualProviderProtocolModel;
+    private testManualProviderInference;
+    private testSellerInference;
+    private recordManualProviderProbeResult;
     private manualProviderErrorClass;
     private shouldFailoverManualProvider;
     private fetchManualProviderRoute;