llm-simple-router 0.4.1 → 0.4.3

package/dist/admin/logs.js

@@ -44,7 +44,7 @@ export const adminLogRoutes = (app, options, done) => {
         if (!log) {
             return reply.code(HTTP_NOT_FOUND).send({ error: { message: "Log not found" } });
         }
-        return reply.send({ data: log });
+        return reply.send(log);
     });
     app.get("/admin/api/logs/:id/children", async (request, reply) => {
         const params = request.params;
@@ -53,7 +53,7 @@ export const adminLogRoutes = (app, options, done) => {
             return reply.code(HTTP_NOT_FOUND).send({ error: { message: "Log not found" } });
         }
         const rows = getRequestLogChildren(db, params.id);
-        return reply.send({ data: rows });
+        return reply.send(rows);
     });
     app.delete("/admin/api/logs/before", { schema: { body: DeleteLogsBeforeSchema } }, async (request, reply) => {
         const body = request.body;

package/dist/admin/routes.js

@@ -10,6 +10,7 @@ import { adminProxyEnhancementRoutes } from "./proxy-enhancement.js";
 import { adminRouterKeyRoutes } from "./router-keys.js";
 import { adminSetupRoutes } from "./setup.js";
 import { adminMonitorRoutes } from "./monitor.js";
+import { adminSettingsRoutes } from "./settings.js";
 import { adminRecommendedRoutes } from "./recommended.js";
 import { adminUsageRoutes } from "./usage.js";
 export const adminRoutes = (app, options, done) => {
@@ -27,6 +28,7 @@ export const adminRoutes = (app, options, done) => {
     app.register(adminMetricsRoutes, { db: options.db });
     app.register(adminProxyEnhancementRoutes, { db: options.db });
     app.register(adminMonitorRoutes, { tracker: options.tracker });
+    app.register(adminSettingsRoutes, { db: options.db });
     app.register(adminRecommendedRoutes, { db: options.db });
     app.register(adminUsageRoutes, { db: options.db });
     done();

package/dist/admin/settings.d.ts

@@ -0,0 +1,7 @@
+import { FastifyPluginCallback } from "fastify";
+import Database from "better-sqlite3";
+interface SettingsOptions {
+    db: Database.Database;
+}
+export declare const adminSettingsRoutes: FastifyPluginCallback<SettingsOptions>;
+export {};

package/dist/admin/settings.js

@@ -0,0 +1,16 @@
+import { getLogRetentionDays, setLogRetentionDays } from "../db/settings.js";
+export const adminSettingsRoutes = (app, options, done) => {
+    const { db } = options;
+    app.get("/admin/api/settings/log-retention", async () => {
+        return { days: getLogRetentionDays(db) };
+    });
+    app.put("/admin/api/settings/log-retention", async (request) => {
+        const { days } = request.body;
+        if (!Number.isInteger(days) || days < 0 || days > 90) {
+            throw { statusCode: 400, message: "days must be integer 0-90" };
+        }
+        setLogRetentionDays(db, days);
+        return { days };
+    });
+    done();
+};

package/dist/db/index.d.ts

@@ -6,7 +6,7 @@ export { getModelMapping, getAllModelMappings, createModelMapping, updateModelMa
 export type { ModelMapping, MappingGroup, ProviderModelEntry } from "./mappings.js";
 export { getActiveRetryRules, getAllRetryRules, createRetryRule, updateRetryRule, deleteRetryRule, } from "./retry-rules.js";
 export type { RetryRule } from "./retry-rules.js";
-export { insertRequestLog, getRequestLogs, getRequestLogById, deleteLogsBefore, getRequestLogChildren, getRequestLogsGrouped, } from "./logs.js";
+export { insertRequestLog, getRequestLogs, getRequestLogById, deleteLogsBefore, getRequestLogChildren, getRequestLogsGrouped, updateLogMetrics, updateLogStreamContent, backfillMetricsFromRequestMetrics, } from "./logs.js";
 export type { RequestLog, RequestLogGroupedRow, RequestLogListRow } from "./logs.js";
 export { getRouterKeyByHash, getAllRouterKeys, getRouterKeyById, createRouterKey, updateRouterKey, deleteRouterKey, getAvailableModels, } from "./router-keys.js";
 export type { RouterKey } from "./router-keys.js";

package/dist/db/index.js

@@ -5,11 +5,17 @@ import { fileURLToPath } from "url";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const MIGRATIONS_DIR = join(__dirname, "migrations");
+const MIGRATION_RENAMES = {
+    "019_drop_log_redundancy.sql": "020_drop_log_redundancy.sql",
+    "020_merge_metrics_columns.sql": "021_merge_metrics_columns.sql",
+};
 export function initDatabase(dbPath) {
     if (dbPath !== ":memory:") {
         mkdirSync(dirname(dbPath), { recursive: true });
     }
     const db = new Database(dbPath);
+    db.pragma("journal_mode = WAL");
+    db.pragma("foreign_keys = ON");
     db.exec(`
     CREATE TABLE IF NOT EXISTS migrations (
       name TEXT PRIMARY KEY,
@@ -17,6 +23,14 @@ export function initDatabase(dbPath) {
     );
   `);
     const applied = new Set(db.prepare("SELECT name FROM migrations").all().map((r) => r.name));
+    // 将已应用的旧文件名更新为新文件名，避免重命名后重复执行
+    for (const [oldName, newName] of Object.entries(MIGRATION_RENAMES)) {
+        if (applied.has(oldName) && !applied.has(newName)) {
+            db.prepare("UPDATE migrations SET name = ? WHERE name = ?").run(newName, oldName);
+            applied.delete(oldName);
+            applied.add(newName);
+        }
+    }
     const files = readdirSync(MIGRATIONS_DIR)
         .filter((f) => f.endsWith(".sql"))
         .sort();
@@ -25,13 +39,15 @@ export function initDatabase(dbPath) {
             continue;
         try {
             const sql = readFileSync(join(MIGRATIONS_DIR, file), "utf-8");
-            db.exec(sql);
+            db.transaction(() => {
+                db.exec(sql);
+                db.prepare("INSERT INTO migrations (name, applied_at) VALUES (?, ?)").run(file, new Date().toISOString());
+            })();
         }
         catch (err) {
             console.error(`Failed to apply migration ${file}:`, err);
             throw err;
         }
-        db.prepare("INSERT INTO migrations (name, applied_at) VALUES (?, ?)").run(file, new Date().toISOString());
     }
     return db;
 }
@@ -39,7 +55,7 @@ export function initDatabase(dbPath) {
 export { getActiveProviders, getAllProviders, getProviderById, createProvider, updateProvider, deleteProvider, PROVIDER_CONCURRENCY_DEFAULTS, } from "./providers.js";
 export { getModelMapping, getAllModelMappings, createModelMapping, updateModelMapping, deleteModelMapping, getMappingGroup, getMappingGroupById, getAllMappingGroups, createMappingGroup, updateMappingGroup, deleteMappingGroup, getActiveProviderModels, resolveByProviderModel, } from "./mappings.js";
 export { getActiveRetryRules, getAllRetryRules, createRetryRule, updateRetryRule, deleteRetryRule, } from "./retry-rules.js";
-export { insertRequestLog, getRequestLogs, getRequestLogById, deleteLogsBefore, getRequestLogChildren, getRequestLogsGrouped, } from "./logs.js";
+export { insertRequestLog, getRequestLogs, getRequestLogById, deleteLogsBefore, getRequestLogChildren, getRequestLogsGrouped, updateLogMetrics, updateLogStreamContent, backfillMetricsFromRequestMetrics, } from "./logs.js";
 export { getRouterKeyByHash, getAllRouterKeys, getRouterKeyById, createRouterKey, updateRouterKey, deleteRouterKey, getAvailableModels, } from "./router-keys.js";
 export { getMetricsSummary, getMetricsTimeseries, insertMetrics } from "./metrics.js";
 export { getStats } from "./stats.js";

package/dist/db/log-cleaner.d.ts

@@ -0,0 +1,10 @@
+import Database from "better-sqlite3";
+export interface LogCleanupHandle {
+    stop: () => void;
+}
+/** 运行一次清理，返回删除条数 */
+export declare function runLogCleanup(db: Database.Database): number;
+/** 启动定时清理，返回 handle 用于停止 */
+export declare function scheduleLogCleanup(db: Database.Database, log: {
+    info: (msg: string) => void;
+}): LogCleanupHandle;

package/dist/db/log-cleaner.js

@@ -0,0 +1,42 @@
+import { deleteLogsBefore } from "./logs.js";
+import { getLogRetentionDays } from "./settings.js";
+const MS_PER_DAY = 86_400_000;
+const CLEANUP_INTERVAL_MS = 3_600_000; // 1 小时
+/** 运行一次清理，返回删除条数 */
+export function runLogCleanup(db) {
+    const days = getLogRetentionDays(db);
+    if (days <= 0)
+        return 0;
+    const cutoff = new Date(Date.now() - days * MS_PER_DAY).toISOString();
+    return deleteLogsBefore(db, cutoff);
+}
+/** 启动定时清理，返回 handle 用于停止 */
+export function scheduleLogCleanup(db, log) {
+    let cleaning = false;
+    let timer = null;
+    const doCleanup = () => {
+        if (cleaning)
+            return;
+        cleaning = true;
+        try {
+            const deleted = runLogCleanup(db);
+            if (deleted > 0)
+                log.info(`Log cleanup: deleted ${deleted} records`);
+        }
+        finally {
+            cleaning = false;
+        }
+    };
+    // 启动时立即执行一次
+    doCleanup();
+    // 定时执行
+    timer = setInterval(doCleanup, CLEANUP_INTERVAL_MS);
+    return {
+        stop: () => {
+            if (timer) {
+                clearInterval(timer);
+                timer = null;
+            }
+        },
+    };
+}

package/dist/db/logs.d.ts

@@ -9,21 +9,27 @@ export interface RequestLog {
     is_stream: number;
     error_message: string | null;
     created_at: string;
-    request_body: string | null;
-    response_body: string | null;
     client_request: string | null;
     upstream_request: string | null;
     upstream_response: string | null;
-    client_response: string | null;
     is_retry: number;
     is_failover: number;
     original_request_id: string | null;
     original_model: string | null;
+    input_tokens: number | null;
+    output_tokens: number | null;
+    cache_read_tokens: number | null;
+    ttft_ms: number | null;
+    tokens_per_second: number | null;
+    stop_reason: string | null;
+    backend_model: string | null;
+    metrics_complete: number;
+    stream_text_content: string | null;
 }
-/** 列表查询扩展字段：JOIN request_metrics + providers 获得 */
+/** 列表查询扩展字段：JOIN providers 获得 provider_name */
 export interface RequestLogListRow extends RequestLog {
-    backend_model: string | null;
     provider_name: string | null;
+    child_count?: number;
 }
 export interface RequestLogInsert {
     id: string;
@@ -35,12 +41,9 @@ export interface RequestLogInsert {
     is_stream: number;
     error_message: string | null;
     created_at: string;
-    request_body?: string | null;
-    response_body?: string | null;
     client_request?: string | null;
     upstream_request?: string | null;
     upstream_response?: string | null;
-    client_response?: string | null;
     is_retry?: number;
     is_failover?: number;
     original_request_id?: string | null;
@@ -62,6 +65,21 @@ export declare function getRequestLogs(db: Database.Database, options: {
     total: number;
 };
 export declare function getRequestLogById(db: Database.Database, id: string): RequestLog | undefined;
+type MetricsUpdate = {
+    input_tokens?: number | null;
+    output_tokens?: number | null;
+    cache_read_tokens?: number | null;
+    ttft_ms?: number | null;
+    tokens_per_second?: number | null;
+    stop_reason?: string | null;
+    is_complete?: number;
+};
+/** 双写：collectTransportMetrics 写 request_metrics 的同时，更新 request_logs 的冗余列 */
+export declare function updateLogMetrics(db: Database.Database, logId: string, m: MetricsUpdate): void;
+/** 流式请求完成后，将 tracker 中累积的文本内容写入 request_logs */
+export declare function updateLogStreamContent(db: Database.Database, logId: string, textContent: string): void;
+/** 启动时回填：从 request_metrics 补齐 metrics_complete = 0 但实际有指标的行 */
+export declare function backfillMetricsFromRequestMetrics(db: Database.Database): number;
 export declare function deleteLogsBefore(db: Database.Database, beforeDate: string): number;
 /** 查询某条日志的子请求（retry/failover 关联），上限 100 条 */
 export declare function getRequestLogChildren(db: Database.Database, parentId: string): RequestLogListRow[];
@@ -82,3 +100,4 @@ export declare function getRequestLogsGrouped(db: Database.Database, options: {
     data: RequestLogGroupedRow[];
     total: number;
 };
+export {};

package/dist/db/logs.js

@@ -1,14 +1,17 @@
 // --- request_logs ---
-/** 三处日志列表查询共享的 SELECT 列 + JOIN 子句 */
+/** 日志列表查询共享的 SELECT 列 + JOIN 子句（metrics 已冗余到 request_logs，无需 JOIN request_metrics） */
 const LOG_LIST_SELECT = `rl.id, rl.api_type, rl.model, rl.provider_id, rl.status_code, rl.latency_ms,
             rl.is_stream, rl.error_message, rl.created_at, rl.is_retry, rl.is_failover, rl.original_request_id, rl.original_model,
             CASE WHEN rl.provider_id = 'router' THEN rl.upstream_request ELSE NULL END AS upstream_request,
-            rm.backend_model, COALESCE(p.name, rl.provider_id) AS provider_name`;
-const LOG_LIST_JOIN = `LEFT JOIN request_metrics rm ON rm.request_log_id = rl.id
-     LEFT JOIN providers p ON p.id = rl.provider_id`;
+            rl.input_tokens, rl.output_tokens, rl.cache_read_tokens, rl.ttft_ms, rl.tokens_per_second, rl.stop_reason,
+            rl.backend_model, rl.metrics_complete,
+            COALESCE(p.name, rl.provider_id) AS provider_name`;
+const LOG_LIST_JOIN = `LEFT JOIN providers p ON p.id = rl.provider_id`;
 export function insertRequestLog(db, log) {
-    db.prepare(`INSERT INTO request_logs (id, api_type, model, provider_id, status_code, latency_ms, is_stream, error_message, created_at, request_body, response_body, client_request, upstream_request, upstream_response, client_response, is_retry, is_failover, original_request_id, router_key_id, original_model)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(log.id, log.api_type, log.model, log.provider_id, log.status_code, log.latency_ms, log.is_stream, log.error_message, log.created_at, log.request_body ?? null, log.response_body ?? null, log.client_request ?? null, log.upstream_request ?? null, log.upstream_response ?? null, log.client_response ?? null, log.is_retry ?? 0, log.is_failover ?? 0, log.original_request_id ?? null, log.router_key_id ?? null, log.original_model ?? null);
+    db.prepare(`INSERT INTO request_logs (id, api_type, model, provider_id, status_code, latency_ms,
+      is_stream, error_message, created_at, client_request, upstream_request, upstream_response,
+      is_retry, is_failover, original_request_id, router_key_id, original_model)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(log.id, log.api_type, log.model, log.provider_id, log.status_code, log.latency_ms, log.is_stream, log.error_message, log.created_at, log.client_request ?? null, log.upstream_request ?? null, log.upstream_response ?? null, log.is_retry ?? 0, log.is_failover ?? 0, log.original_request_id ?? null, log.router_key_id ?? null, log.original_model ?? null);
 }
 function buildLogWhereClause(options, baseCondition) {
     let where = baseCondition;
@@ -54,6 +57,37 @@ export function getRequestLogs(db, options) {
 export function getRequestLogById(db, id) {
     return db.prepare("SELECT * FROM request_logs WHERE id = ?").get(id);
 }
+/** 双写：collectTransportMetrics 写 request_metrics 的同时，更新 request_logs 的冗余列 */
+export function updateLogMetrics(db, logId, m) {
+    db.prepare(`UPDATE request_logs SET
+       input_tokens = ?, output_tokens = ?, cache_read_tokens = ?,
+       ttft_ms = ?, tokens_per_second = ?, stop_reason = ?,
+       backend_model = (SELECT backend_model FROM request_metrics WHERE request_log_id = ?),
+       metrics_complete = ?
+     WHERE id = ?`).run(m.input_tokens ?? null, m.output_tokens ?? null, m.cache_read_tokens ?? null, m.ttft_ms ?? null, m.tokens_per_second ?? null, m.stop_reason ?? null, logId, m.is_complete ?? 1, logId);
+}
+/** 流式请求完成后，将 tracker 中累积的文本内容写入 request_logs */
+export function updateLogStreamContent(db, logId, textContent) {
+    db.prepare("UPDATE request_logs SET stream_text_content = ? WHERE id = ?").run(textContent, logId);
+}
+/** 启动时回填：从 request_metrics 补齐 metrics_complete = 0 但实际有指标的行 */
+export function backfillMetricsFromRequestMetrics(db) {
+    return db.prepare(`
+    UPDATE request_logs
+    SET
+      input_tokens = rm.input_tokens,
+      output_tokens = rm.output_tokens,
+      cache_read_tokens = rm.cache_read_tokens,
+      ttft_ms = rm.ttft_ms,
+      tokens_per_second = rm.tokens_per_second,
+      stop_reason = rm.stop_reason,
+      backend_model = rm.backend_model,
+      metrics_complete = rm.is_complete
+    FROM request_metrics rm
+    WHERE rm.request_log_id = request_logs.id
+      AND request_logs.metrics_complete = 0
+  `).run().changes;
+}
 export function deleteLogsBefore(db, beforeDate) {
     return db.prepare("DELETE FROM request_logs WHERE created_at < ?").run(beforeDate).changes;
 }

package/dist/db/migrations/020_drop_log_redundancy.sql

@@ -0,0 +1,8 @@
+-- 019_drop_log_redundancy.sql
+-- 删除冗余大文本字段：request_body = client_request.body, response_body = upstream_response.body, client_response ≈ upstream_response
+ALTER TABLE request_logs DROP COLUMN request_body;
+ALTER TABLE request_logs DROP COLUMN response_body;
+ALTER TABLE request_logs DROP COLUMN client_response;
+
+-- 日志自动清理保留天数（默认 3 天，0 = 不自动清理）
+INSERT OR IGNORE INTO settings (key, value) VALUES ('log_retention_days', '3');

package/dist/db/migrations/021_merge_metrics_columns.sql

@@ -0,0 +1,28 @@
+-- V1 双写：将 request_metrics 列冗余到 request_logs，消除日志查询的 JOIN
+-- request_metrics 表保留不动，聚合查询仍查它
+
+ALTER TABLE request_logs ADD COLUMN input_tokens INTEGER;
+ALTER TABLE request_logs ADD COLUMN output_tokens INTEGER;
+ALTER TABLE request_logs ADD COLUMN cache_read_tokens INTEGER;
+ALTER TABLE request_logs ADD COLUMN ttft_ms INTEGER;
+ALTER TABLE request_logs ADD COLUMN tokens_per_second REAL;
+ALTER TABLE request_logs ADD COLUMN stop_reason TEXT;
+ALTER TABLE request_logs ADD COLUMN backend_model TEXT;
+ALTER TABLE request_logs ADD COLUMN metrics_complete INTEGER NOT NULL DEFAULT 0;
+
+-- 流式请求的累积文本内容（从 tracker.appendStreamChunk 中提取的纯文本）
+ALTER TABLE request_logs ADD COLUMN stream_text_content TEXT;
+
+-- 回填历史数据：把已有的 request_metrics 写入 request_logs 新列
+UPDATE request_logs
+SET
+  input_tokens = rm.input_tokens,
+  output_tokens = rm.output_tokens,
+  cache_read_tokens = rm.cache_read_tokens,
+  ttft_ms = rm.ttft_ms,
+  tokens_per_second = rm.tokens_per_second,
+  stop_reason = rm.stop_reason,
+  backend_model = rm.backend_model,
+  metrics_complete = rm.is_complete
+FROM request_metrics rm
+WHERE rm.request_log_id = request_logs.id;

package/dist/db/settings.d.ts

@@ -2,3 +2,5 @@ import Database from "better-sqlite3";
 export declare function getSetting(db: Database.Database, key: string): string | null;
 export declare function setSetting(db: Database.Database, key: string, value: string): void;
 export declare function isInitialized(db: Database.Database): boolean;
+export declare function getLogRetentionDays(db: Database.Database): number;
+export declare function setLogRetentionDays(db: Database.Database, days: number): void;

package/dist/db/settings.js

@@ -8,3 +8,10 @@ export function setSetting(db, key, value) {
 export function isInitialized(db) {
     return getSetting(db, "initialized") === "true";
 }
+export function getLogRetentionDays(db) {
+    const val = getSetting(db, "log_retention_days");
+    return val ? parseInt(val, 10) : 3;
+}
+export function setLogRetentionDays(db, days) {
+    setSetting(db, "log_retention_days", String(days));
+}

package/dist/index.js

@@ -21,7 +21,7 @@ function getProxyApiType(url) {
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 import { getConfig } from "./config.js";
-import { initDatabase, getAllProviders } from "./db/index.js";
+import { initDatabase, getAllProviders, backfillMetricsFromRequestMetrics } from "./db/index.js";
 import { loadRecommendedConfig } from "./config/recommended.js";
 import { authMiddleware } from "./middleware/auth.js";
 import { openaiProxy } from "./proxy/openai.js";
@@ -32,16 +32,19 @@ import { ProviderSemaphoreManager } from "./proxy/semaphore.js";
 import { RequestTracker } from "./monitor/request-tracker.js";
 import { modelState } from "./proxy/model-state.js";
 import { UsageWindowTracker } from "./proxy/usage-window-tracker.js";
+import { scheduleLogCleanup } from "./db/log-cleaner.js";
 import fastifyStatic from "@fastify/static";
 export async function buildApp(options) {
     const config = options?.config ?? getBaseConfig();
     // 允许外部传入已初始化的 DB（测试用），否则自行创建
     let db;
+    let shouldBackfill = false;
     if (options?.db) {
         db = options.db;
     }
     else {
         db = initDatabase(config.DB_PATH);
+        shouldBackfill = true;
     }
     const isDev = process.env.NODE_ENV !== "production";
     const app = Fastify({
@@ -103,6 +106,13 @@ export async function buildApp(options) {
         return reply.code(status).send({ error: { message: fastifyError.message } });
     });
     loadRecommendedConfig();
+    // 启动时回填：补齐回退老版本期间缺失的 metrics 冗余列
+    if (shouldBackfill) {
+        const backfilled = backfillMetricsFromRequestMetrics(db);
+        if (backfilled > 0) {
+            app.log.info({ backfilled }, "Backfilled metrics from request_metrics");
+        }
+    }
     // 注入 DB 到 modelState 单例，启用会话级持久化
     modelState.init(db);
     const matcher = new RetryRuleMatcher();
@@ -173,11 +183,13 @@ export async function buildApp(options) {
     app.get("/health", async () => {
         return { status: "ok" };
     });
+    const logCleanup = scheduleLogCleanup(db, app.log);
     return {
         app,
         db,
         usageWindowTracker,
         close: async () => {
+            logCleanup.stop();
             tracker.stopPushInterval();
             await app.close();
             db.close();

package/dist/monitor/types.d.ts

@@ -27,6 +27,7 @@ export interface ActiveRequest {
     streamMetrics?: StreamMetricsSnapshot;
     streamContent?: StreamContentSnapshot;
     clientIp?: string;
+    sessionId?: string;
     completedAt?: number;
 }
 export interface AttemptSnapshot {
@@ -38,7 +39,9 @@ export interface AttemptSnapshot {
 export interface StreamMetricsSnapshot {
     inputTokens: number | null;
     outputTokens: number | null;
+    cacheReadTokens: number | null;
     ttftMs: number | null;
+    tokensPerSecond: number | null;
     stopReason: string | null;
     isComplete: boolean;
 }

package/dist/proxy/log-helpers.d.ts

@@ -17,13 +17,11 @@ export interface RequestLogParams extends LogRetryMeta {
     provider: Provider;
     isStream: boolean;
     startTime: number;
-    reqBody: string;
     clientReq: string;
     upstreamReq: string;
     status: number;
     respBody: string | null;
     upHdrs: Record<string, string>;
-    cliHdrs: Record<string, string>;
     routerKeyId?: string | null;
     originalModel?: string | null;
 }

package/dist/proxy/log-helpers.js

@@ -1,15 +1,14 @@
 import { insertRequestLog } from "../db/index.js";
 /** 插入成功请求日志，供 openai/anthropic 插件共享 */
 export function insertSuccessLog(db, params) {
-    const { id: logId, apiType, model, provider, isStream, startTime, reqBody, clientReq, upstreamReq, status, respBody, upHdrs, cliHdrs, isRetry = false, isFailover = false, originalRequestId = null, routerKeyId = null, originalModel = null } = params;
+    const { id: logId, apiType, model, provider, isStream, startTime, clientReq, upstreamReq, status, respBody, upHdrs, isRetry = false, isFailover = false, originalRequestId = null, routerKeyId = null, originalModel = null } = params;
     insertRequestLog(db, {
         id: logId, api_type: apiType, model, provider_id: provider.id,
         status_code: status, latency_ms: Date.now() - startTime,
         is_stream: isStream ? 1 : 0, error_message: null,
-        created_at: new Date().toISOString(), request_body: reqBody,
-        response_body: respBody, client_request: clientReq, upstream_request: upstreamReq,
+        created_at: new Date().toISOString(),
+        client_request: clientReq, upstream_request: upstreamReq,
         upstream_response: JSON.stringify({ statusCode: status, headers: upHdrs, body: respBody }),
-        client_response: JSON.stringify({ statusCode: status, headers: cliHdrs, body: respBody }),
         is_retry: isRetry ? 1 : 0, is_failover: isFailover ? 1 : 0, original_request_id: originalRequestId,
         router_key_id: routerKeyId, original_model: originalModel,
     });
@@ -27,7 +26,6 @@ export function insertRejectedLog(params) {
         is_stream: isStream ? 1 : 0,
         error_message: errorMessage,
         created_at: new Date().toISOString(),
-        request_body: JSON.stringify(originalBody),
         client_request: JSON.stringify({ headers: clientHeaders, body: originalBody }),
         is_failover: isFailover ? 1 : 0,
         original_request_id: originalRequestId,

package/dist/proxy/orchestrator.d.ts

@@ -21,6 +21,8 @@ export interface OrchestratorConfig {
     isStream: boolean;
     /** 外部生成的 tracker ID，用于 tracker.appendStreamChunk / tracker.update 等回调匹配 */
     trackerId?: string;
+    /** Claude Code 的 session ID，从 x-claude-code-session-id 请求头获取 */
+    sessionId?: string;
 }
 export interface HandleContext {
     streamTimeoutMs?: number;

package/dist/proxy/orchestrator.js

@@ -49,6 +49,7 @@ export class ProxyOrchestrator {
             retryCount: 0,
             attempts: [],
             clientIp: request.ip,
+            sessionId: config.sessionId,
         };
     }
     createAbortSignal(request) {

package/dist/proxy/proxy-handler.js

@@ -9,6 +9,8 @@ import { logResilienceResult, collectTransportMetrics, handleIntercept, sanitize
 import { buildUpstreamHeaders } from "./proxy-core.js";
 import { UPSTREAM_SUCCESS, ProviderSwitchNeeded } from "./types.js";
 import { SSEMetricsTransform } from "../metrics/sse-metrics-transform.js";
+import { MetricsExtractor } from "../metrics/metrics-extractor.js";
+import { updateLogStreamContent } from "../db/index.js";
 import { callNonStream, callStream } from "./transport.js";
 import { insertRejectedLog } from "./log-helpers.js";
 const HTTP_ERROR_THRESHOLD = 400;
@@ -120,7 +122,9 @@ export async function handleProxyRequest(request, reply, apiType, upstreamPath,
                         deps.tracker?.update(logId, {
                             streamMetrics: {
                                 inputTokens: m.input_tokens, outputTokens: m.output_tokens,
-                                ttftMs: m.ttft_ms, stopReason: m.stop_reason, isComplete: m.is_complete === 1,
+                                cacheReadTokens: m.cache_read_tokens,
+                                ttftMs: m.ttft_ms, tokensPerSecond: m.tokens_per_second,
+                                stopReason: m.stop_reason, isComplete: m.is_complete === 1,
                             },
                         });
                     },
@@ -134,6 +138,20 @@ export async function handleProxyRequest(request, reply, apiType, upstreamPath,
                 return callStream(provider, apiKey, body, cliHdrs, reply, deps.streamTimeoutMs, upstreamPath, buildUpstreamHeaders, metricsTransform, checkEarlyError);
             }
             const result = await callNonStream(provider, apiKey, body, cliHdrs, upstreamPath, buildUpstreamHeaders);
+            // 非流式请求：从响应体提取指标并更新 tracker
+            if (result.kind === "success") {
+                const mr = MetricsExtractor.fromNonStreamResponse(apiType, result.body);
+                if (mr) {
+                    deps.tracker?.update(logId, {
+                        streamMetrics: {
+                            inputTokens: mr.input_tokens, outputTokens: mr.output_tokens,
+                            cacheReadTokens: mr.cache_read_tokens,
+                            ttftMs: mr.ttft_ms, tokensPerSecond: mr.tokens_per_second,
+                            stopReason: mr.stop_reason, isComplete: mr.is_complete === 1,
+                        },
+                    });
+                }
+            }
             // 非流式响应注入模型信息标签（模型映射场景）
             if (originalModel && result.kind === "success" && result.statusCode === UPSTREAM_SUCCESS) {
                 try {
@@ -150,13 +168,20 @@ export async function handleProxyRequest(request, reply, apiType, upstreamPath,
             return result;
         };
         try {
-            const resilienceResult = await deps.orchestrator.handle(request, reply, apiType, { resolved, provider, clientModel: effectiveModel, isStream, trackerId: logId }, { retryMaxAttempts: deps.retryMaxAttempts, retryBaseDelayMs: deps.retryBaseDelayMs, isFailover, ruleMatcher: deps.matcher, transportFn });
+            const resilienceResult = await deps.orchestrator.handle(request, reply, apiType, { resolved, provider, clientModel: effectiveModel, isStream, trackerId: logId, sessionId }, { retryMaxAttempts: deps.retryMaxAttempts, retryBaseDelayMs: deps.retryBaseDelayMs, isFailover, ruleMatcher: deps.matcher, transportFn });
             const lastLogId = logResilienceResult(deps.db, {
                 apiType, model: effectiveModel, providerId: provider.id, isStream,
-                reqBodyStr, clientReq, upstreamReqBase, logId, routerKeyId, originalModel,
+                clientReq, upstreamReqBase, logId, routerKeyId, originalModel,
                 failover: { isFailoverIteration, rootLogId: rootLogId },
             }, resilienceResult.attempts, resilienceResult.result, startTime);
             collectTransportMetrics(deps.db, apiType, resilienceResult.result, isStream, lastLogId, provider.id, resolved.backend_model, request);
+            // 流式请求：将 tracker 中累积的文本内容持久化到日志
+            if (isStream && deps.tracker) {
+                const req = deps.tracker.get(lastLogId);
+                const text = req?.streamContent?.textContent;
+                if (text)
+                    updateLogStreamContent(deps.db, lastLogId, text);
+            }
             // Failover: 单 provider 内重试已耗尽但仍失败，尝试下一个 target
             if (isFailover && !reply.raw.headersSent) {
                 const tr = resilienceResult.result;
@@ -212,7 +237,7 @@ export async function handleProxyRequest(request, reply, apiType, upstreamPath,
                 id: logId, api_type: apiType, model: effectiveModel, provider_id: provider.id,
                 status_code: 502, latency_ms: Date.now() - startTime, is_stream: isStream ? 1 : 0,
                 error_message: errMsg || "Upstream connection failed", created_at: new Date().toISOString(),
-                request_body: reqBodyStr, client_request: clientReq, upstream_request: upstreamReqBase,
+                client_request: clientReq, upstream_request: upstreamReqBase,
                 is_failover: isFailoverIteration ? 1 : 0, original_request_id: isFailoverIteration ? rootLogId : null,
                 router_key_id: routerKeyId, original_model: originalModel,
             });

package/dist/proxy/proxy-logging.d.ts

@@ -17,7 +17,6 @@ export declare function logResilienceResult(db: Database.Database, params: {
     model: string;
     providerId: string;
     isStream: boolean;
-    reqBodyStr: string;
     clientReq: string;
     upstreamReqBase: string;
     logId: string;