llm-simple-router 0.10.10 → 0.10.12

package/dist/core/monitor/types.d.ts

@@ -1,3 +1,4 @@
+import type { MappingReason } from "../types.js";
 /** Abstract SSE client interface (decouples from Node http ServerResponse). */
 export interface SSEClient {
     write(data: string): void;
@@ -35,6 +36,7 @@ export interface ActiveRequest {
     streamContent?: StreamContentSnapshot;
     clientIp?: string;
     sessionId?: string;
+    mappingReason?: MappingReason;
     clientRequest?: string;
     upstreamRequest?: string;
     completedAt?: number;

package/dist/core/types.d.ts

@@ -21,6 +21,7 @@ export interface ConcurrencyOverride {
     queue_timeout_ms?: number;
     max_queue_size?: number;
 }
+export type MappingReason = "direct_format" | "group_base_rule" | "group_schedule" | "fallback_provider" | "overflow_redirect" | "failover_retry";
 export interface ResolveResult {
     target: Target;
     concurrency_override?: ConcurrencyOverride;
@@ -28,6 +29,8 @@ export interface ResolveResult {
     targetCount: number;
     /** 排除前的完整 target 列表，用于请求级缓存（BP-H2） */
     allTargets?: Target[];
+    /** 映射解析原因，标识走了哪条解析路径 */
+    mappingReason: MappingReason;
 }
 export interface MetricsResult {
     input_tokens: number | null;

package/dist/db/index.d.ts

@@ -12,7 +12,7 @@ export { getRouterKeyByHash, getAllRouterKeys, getRouterKeyById, createRouterKey
 export type { RouterKey } from "./router-keys.js";
 export { getMetricsSummary, getMetricsTimeseries, insertMetrics, getClientTypeBreakdown } from "./metrics.js";
 export type { MetricsSummaryRow, MetricsTimeseriesRow, MetricsPeriod, MetricsMetric, MetricsRow, MetricsInsert, ClientTypeBreakdown } from "./metrics.js";
-export { getStats } from "./stats.js";
+export { getStats, getLatestMetricTime } from "./stats.js";
 export type { Stats } from "./stats.js";
 export { getSetting, setSetting, isInitialized } from "./settings.js";
 export { getDbMaxSizeMb, setDbMaxSizeMb, getLogTableMaxSizeMb, setLogTableMaxSizeMb, } from "./settings.js";

package/dist/db/index.js

@@ -145,7 +145,7 @@ export { getActiveRetryRules, getAllRetryRules, getRetryRuleById, createRetryRul
 export { insertRequestLog, getRequestLogs, getRequestLogById, deleteLogsBefore, getRequestLogChildren, getRequestLogsGrouped, updateLogStreamContent, updateLogClientStatus, estimateLogTableSize, deleteOldestLogs, getLogCount, updateLogPipelineSnapshot, } from "./logs.js";
 export { getRouterKeyByHash, getAllRouterKeys, getRouterKeyById, createRouterKey, updateRouterKey, deleteRouterKey, getAvailableModels, } from "./router-keys.js";
 export { getMetricsSummary, getMetricsTimeseries, insertMetrics, getClientTypeBreakdown } from "./metrics.js";
-export { getStats } from "./stats.js";
+export { getStats, getLatestMetricTime } from "./stats.js";
 export { getSetting, setSetting, isInitialized } from "./settings.js";
 export { getDbMaxSizeMb, setDbMaxSizeMb, getLogTableMaxSizeMb, setLogTableMaxSizeMb, } from "./settings.js";
 export { insertWindow, getLatestWindow, getWindowsInRange, getWindowUsage, } from "./usage-windows.js";

package/dist/db/migrations/046_fix_is_complete_for_successful_requests.sql

@@ -0,0 +1,10 @@
+-- Fix historical request_metrics where is_complete=0 despite successful responses.
+-- Root cause: StreamProxy.onEnd() collected metrics before SSE parser flush,
+-- causing is_complete to always be 0 for providers using OpenAI SSE format.
+-- Only fix records with clear success signals (status 200 + output tokens + duration).
+UPDATE request_metrics
+SET is_complete = 1
+WHERE is_complete = 0
+  AND status_code = 200
+  AND output_tokens > 0
+  AND total_duration_ms > 0;

package/dist/db/stats.d.ts

@@ -1,4 +1,6 @@
 import Database from "better-sqlite3";
+/** 获取指定条件下的最近一条 metric 的 created_at（用于窗口补齐定位，不限制 is_complete） */
+export declare function getLatestMetricTime(db: Database.Database, providerId?: string, routerKeyId?: string): string | null;
 export interface Stats {
     totalRequests: number;
     successRate: number;

package/dist/db/stats.js

@@ -1,3 +1,19 @@
+/** 获取指定条件下的最近一条 metric 的 created_at（用于窗口补齐定位，不限制 is_complete） */
+export function getLatestMetricTime(db, providerId, routerKeyId) {
+    const conditions = [];
+    const params = [];
+    if (providerId) {
+        conditions.push("rm.provider_id = ?");
+        params.push(providerId);
+    }
+    if (routerKeyId) {
+        conditions.push("rm.router_key_id = ?");
+        params.push(routerKeyId);
+    }
+    const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+    const row = db.prepare(`SELECT rm.created_at FROM request_metrics rm ${where} ORDER BY rm.created_at DESC LIMIT 1`).get(...params);
+    return row?.created_at ?? null;
+}
 export function getStats(db, startTime, endTime, routerKeyId, providerId, backendModel) {
     const conditions = [
         "rm.is_complete = 1",

package/dist/metrics/sse-metrics-transform.d.ts

@@ -30,6 +30,8 @@ export declare class SSEMetricsTransform extends Transform {
     constructor(apiType: "openai" | "openai-responses" | "anthropic", requestStartTime: number, options?: MetricsTransformOptions);
     _transform(chunk: Buffer, _encoding: BufferEncoding, callback: TransformCallback): void;
     _flush(callback: TransformCallback): void;
+    /** Flush SSE parser 缓冲区并处理残余事件，确保 extractor 状态完整 */
+    flushParser(): void;
     getExtractor(): MetricsExtractor;
     /** 从 SSE 事件中提取内容文本，触发 onContentDelta 回调 */
     private emitContentDelta;

package/dist/metrics/sse-metrics-transform.js

@@ -54,6 +54,14 @@ export class SSEMetricsTransform extends Transform {
         }
         callback();
     }
+    /** Flush SSE parser 缓冲区并处理残余事件，确保 extractor 状态完整 */
+    flushParser() {
+        const events = this.parser.flush();
+        for (const event of events) {
+            this.extractor.processEvent(event);
+            this.emitContentDelta(event);
+        }
+    }
     getExtractor() {
         return this.extractor;
     }

package/dist/proxy/format/registry.d.ts

@@ -11,7 +11,7 @@ export declare class FormatRegistry {
         body: Record<string, unknown>;
         upstreamPath: string;
     };
-    transformResponse(bodyStr: string, source: string, target: string): string;
-    transformError(bodyStr: string, source: string, target: string): string;
+    transformResponse(body: Record<string, unknown>, source: string, target: string): Record<string, unknown>;
+    transformError(body: Record<string, unknown>, source: string, target: string): string;
     createStreamTransform(source: string, target: string, model: string): Transform | undefined;
 }

package/dist/proxy/format/registry.js

@@ -21,26 +21,25 @@ export class FormatRegistry {
             return { body, upstreamPath };
         return { body: converter.transformRequest(body, model), upstreamPath };
     }
-    transformResponse(bodyStr, source, target) {
+    transformResponse(body, source, target) {
         const converter = this.converters.get(`${source}→${target}`);
         if (!converter)
-            return bodyStr;
-        return converter.transformResponse(bodyStr);
+            return body;
+        return converter.transformResponse(body);
     }
-    transformError(bodyStr, source, target) {
+    transformError(body, source, target) {
         if (source === target)
-            return bodyStr;
+            return JSON.stringify(body);
         try {
-            const parsed = JSON.parse(bodyStr);
-            const message = parsed.error?.message ?? parsed.message ?? JSON.stringify(parsed);
-            const code = parsed.error?.code ?? parsed.code;
+            const message = body.error?.message ?? body.message ?? JSON.stringify(body);
+            const code = body.error?.code ?? body.code;
             const targetAdapter = this.adapters.get(target);
             if (!targetAdapter)
-                return bodyStr;
+                return JSON.stringify(body);
             return JSON.stringify(targetAdapter.formatError(message, code));
         }
         catch {
-            return bodyStr;
+            return JSON.stringify(body);
         }
     }
     createStreamTransform(source, target, model) {

package/dist/proxy/format/types.d.ts

@@ -14,7 +14,7 @@ export interface FormatConverter {
     readonly sourceType: string;
     readonly targetType: string;
     transformRequest(body: Record<string, unknown>, model: string): Record<string, unknown>;
-    transformResponse(bodyStr: string): string;
+    transformResponse(body: Record<string, unknown>): Record<string, unknown>;
     createStreamTransform(model: string): Transform;
 }
 /** Factory: eliminates repetitive object literal structure across 6 converters. */
@@ -22,6 +22,6 @@ export declare function createConverter(deps: {
     sourceType: string;
     targetType: string;
     requestTransform: (body: Record<string, unknown>) => Record<string, unknown>;
-    responseTransform: (bodyStr: string) => string;
+    responseTransform: (body: Record<string, unknown>) => Record<string, unknown>;
     streamTransformClass: new (model: string) => Transform;
 }): FormatConverter;

package/dist/proxy/format/types.js

@@ -6,8 +6,8 @@ export function createConverter(deps) {
         transformRequest(body) {
             return deps.requestTransform(body);
         },
-        transformResponse(bodyStr) {
-            return deps.responseTransform(bodyStr);
+        transformResponse(body) {
+            return deps.responseTransform(body);
         },
         createStreamTransform(model) {
             return new deps.streamTransformClass(model);

package/dist/proxy/handler/failover-loop.js

@@ -150,7 +150,7 @@ export async function executeFailoverLoop(ctx, errors, deps, upstreamPath, adapt
         if (cachedTargets) {
             const filtered = filterExcluded(cachedTargets, excludeTargets);
             resolveResult = filtered.length > 0
-                ? { target: filtered[0], concurrency_override: cachedConcurrencyOverride, targetCount: cachedTargets.length }
+                ? { target: filtered[0], concurrency_override: cachedConcurrencyOverride, targetCount: cachedTargets.length, mappingReason: "failover_retry" }
                 : null;
         }
         else {
@@ -191,6 +191,7 @@ export async function executeFailoverLoop(ctx, errors, deps, upstreamPath, adapt
             }
         }
         // --- 溢出重定向 ---
+        let effectiveMappingReason = resolveResult.mappingReason;
         const overflowResult = applyOverflowRedirect(resolved, db, currentBody);
         if (overflowResult) {
             const overflowProvider = getProviderById(db, overflowResult.provider_id);
@@ -198,6 +199,7 @@ export async function executeFailoverLoop(ctx, errors, deps, upstreamPath, adapt
                 resolved = { ...resolved, provider_id: overflowResult.provider_id, backend_model: overflowResult.backend_model };
                 provider = overflowProvider;
                 currentBody = { ...currentBody, model: overflowResult.backend_model };
+                effectiveMappingReason = "overflow_redirect";
             }
         }
         // 当前迭代的工具错误刷新闭包（统一 6 处调用）
@@ -210,7 +212,7 @@ export async function executeFailoverLoop(ctx, errors, deps, upstreamPath, adapt
         const needsTransform = resolvedPath.needsTransform;
         // --- routing ---
         currentBody = { ...currentBody, model: resolved.backend_model };
-        iterationSnapshot.add({ stage: "routing", client_model: clientModel, backend_model: resolved.backend_model, provider_id: resolved.provider_id, strategy: resolveResult.targetCount > 1 ? "failover" : "scheduled" });
+        iterationSnapshot.add({ stage: "routing", client_model: clientModel, backend_model: resolved.backend_model, provider_id: resolved.provider_id, strategy: resolveResult.targetCount > 1 ? "failover" : "scheduled", mapping_reason: effectiveMappingReason });
         iterationSnapshot.add({ stage: "overflow", triggered: overflowResult != null });
         // --- Plugin 调整 body 和 headers ---
         const pluginResult = applyPluginAdjustments(pluginRegistry, currentBody, clientApiType, provider);
@@ -251,25 +253,24 @@ export async function executeFailoverLoop(ctx, errors, deps, upstreamPath, adapt
             try {
                 const parsed = JSON.parse(bodyStr);
                 if (parsed.type === "error" || parsed.error) {
-                    return formatRegistry.transformError(bodyStr, provider.api_type, ctx.apiType);
+                    return formatRegistry.transformError(parsed, provider.api_type, ctx.apiType);
                 }
-                let transformed = formatRegistry.transformResponse(bodyStr, provider.api_type, ctx.apiType);
+                let transformed = formatRegistry.transformResponse(parsed, provider.api_type, ctx.apiType);
                 if (pluginRegistry && !isStream) {
                     try {
-                        const respObj = JSON.parse(transformed);
                         const respCtx = {
-                            response: respObj,
+                            response: transformed,
                             sourceApiType: provider.api_type,
                             targetApiType: clientApiType,
                             provider: { id: provider.id, name: provider.name, base_url: provider.base_url, api_type: provider.api_type },
                         };
                         pluginRegistry.applyBeforeResponse(respCtx);
                         pluginRegistry.applyAfterResponse(respCtx);
-                        transformed = JSON.stringify(respCtx.response);
+                        transformed = respCtx.response;
                     }
                     catch { /* response hooks best-effort */ } // eslint-disable-line taste/no-silent-catch
                 }
-                return transformed;
+                return JSON.stringify(transformed);
             }
             catch (err) {
                 request.log.error({ err }, "responseTransform failed");
@@ -290,7 +291,7 @@ export async function executeFailoverLoop(ctx, errors, deps, upstreamPath, adapt
         const pipelineSnapshot = iterationSnapshot.toJSON();
         // --- Execute through orchestrator ---
         try {
-            const resilienceResult = await orchestrator.handle(request, reply, clientApiType, { resolved, provider, clientModel, isStream, trackerId: logId, sessionId: ctx.metadata.get("session_id"), clientRequest: clientReq, upstreamRequest: upstreamReqBase, concurrencyOverride }, { retryBaseDelayMs: config.RETRY_BASE_DELAY_MS, isFailover, ruleMatcher: matcher, transportFn });
+            const resilienceResult = await orchestrator.handle(request, reply, clientApiType, { resolved, provider, clientModel, isStream, trackerId: logId, sessionId: ctx.metadata.get("session_id"), clientRequest: clientReq, upstreamRequest: upstreamReqBase, concurrencyOverride, mappingReason: effectiveMappingReason }, { retryBaseDelayMs: config.RETRY_BASE_DELAY_MS, isFailover, ruleMatcher: matcher, transportFn });
             // 日志记录
             const lastLogId = logResilienceResult(db, {
                 apiType: clientApiType,

package/dist/proxy/orchestration/orchestrator.d.ts

@@ -1,6 +1,6 @@
 import type { FastifyReply, FastifyRequest } from "fastify";
 import type { TransportResult } from "../types.js";
-import type { Target, ConcurrencyOverride } from "../../core/types.js";
+import type { Target, ConcurrencyOverride, MappingReason } from "../../core/types.js";
 import type { ResilienceLayer, ResilienceResult } from "./resilience.js";
 import type { RetryRuleMatcher } from "./retry-rules.js";
 import type { SemaphoreScope } from "./scope.js";
@@ -30,6 +30,8 @@ export interface OrchestratorConfig {
     upstreamRequest?: string;
     /** Schedule 层的并发覆盖配置，覆盖 Provider 默认并发限制 */
     concurrencyOverride?: ConcurrencyOverride;
+    /** 映射解析原因 */
+    mappingReason?: MappingReason;
 }
 export interface HandleContext {
     streamTimeoutMs?: number;

package/dist/proxy/orchestration/orchestrator.js

@@ -97,6 +97,7 @@ export class ProxyOrchestrator {
             sessionId: config.sessionId,
             clientRequest: config.clientRequest,
             upstreamRequest: config.upstreamRequest,
+            mappingReason: config.mappingReason,
         };
     }
     async executeResilience(config, ctx) {

package/dist/proxy/pipeline-snapshot.d.ts

@@ -12,6 +12,7 @@ export type StageRecord = {
     backend_model: string;
     provider_id: string;
     strategy: string;
+    mapping_reason?: MappingReason;
 } | {
     stage: "overflow";
     triggered: boolean;
@@ -21,6 +22,7 @@ export type StageRecord = {
     stage: "provider_patch";
     types: string[];
 };
+import type { MappingReason } from "../core/types.js";
 export declare class PipelineSnapshot {
     private readonly stages;
     constructor(initial?: StageRecord[]);

package/dist/proxy/routing/mapping-resolver.js

@@ -118,7 +118,7 @@ export function resolveMapping(db, clientModel, context) {
         if (provider) {
             const modelEntries = parseModels(provider.models);
             if (modelEntries.some(m => m.name === backendModel)) {
-                return { target: { backend_model: backendModel, provider_id: provider.id }, targetCount: 1 };
+                return { target: { backend_model: backendModel, provider_id: provider.id }, targetCount: 1, mappingReason: "direct_format" };
             }
         }
         return null;
@@ -131,7 +131,7 @@ export function resolveMapping(db, clientModel, context) {
         for (const p of providers) {
             const modelEntries = parseModels(p.models);
             if (modelEntries.some(m => m.name === clientModel)) {
-                return { target: { backend_model: clientModel, provider_id: p.id }, targetCount: 1 };
+                return { target: { backend_model: clientModel, provider_id: p.id }, targetCount: 1, mappingReason: "fallback_provider" };
             }
         }
         return null;
@@ -158,10 +158,15 @@ export function resolveMapping(db, clientModel, context) {
     // 5. 确定使用的 targets：schedule 优先，否则 base
     let activeTargets = baseTargets;
     let concurrencyOverride;
+    let mappingReason = "group_base_rule";
     if (matchedSchedule) {
         const scheduleTargets = parseScheduleTargets(matchedSchedule.mapping_rule);
+        // schedule 命中但 targets 解析失败时，activeTargets 仍为 base targets
+        // mappingReason 保持 group_base_rule（实际使用的 targets 来源）
+        // concurrencyOverride 来自 schedule（有意保留，schedule 控制并发上限）
         if (scheduleTargets.length > 0) {
             activeTargets = scheduleTargets;
+            mappingReason = "group_schedule";
         }
         concurrencyOverride = parseConcurrencyRule(matchedSchedule.concurrency_rule);
     }
@@ -174,5 +179,6 @@ export function resolveMapping(db, clientModel, context) {
         concurrency_override: concurrencyOverride,
         targetCount: activeTargets.length,
         allTargets: activeTargets,
+        mappingReason,
     };
 }

package/dist/proxy/routing/usage-window-tracker.d.ts

@@ -2,12 +2,10 @@ import Database from "better-sqlite3";
 export declare class UsageWindowTracker {
     private db;
     constructor(db: Database.Database);
-    /** 请求成功后调用，按需创建新窗口 */
+    /** 请求成功后调用，按需创建新窗口（前向模式：窗口 = [now, now + 5h]） */
     recordRequest(providerId: string, routerKeyId?: string): void;
-    /** 启动时按活跃 provider 补齐缺失的窗口 */
+    /** 启动时按活跃 provider 补齐缺失的窗口（每个 provider 仅创建一个前向窗口） */
     reconcileOnStartup(): void;
-    /** 为单个 provider 补齐窗口 */
+    /** 为单个 provider 补齐窗口：无窗口时基于最新 log 创建前向窗口 */
     private reconcileProvider;
-    /** 从 baseTime 开始，每 5h 一个窗口，直到覆盖 lastLogTime */
-    private backfillProviderWindows;
 }

package/dist/proxy/routing/usage-window-tracker.js

@@ -4,71 +4,56 @@ import { getAllProviders } from "../../db/providers.js";
 import { toSqliteDatetime, parseSqliteDatetime as parseDate } from "../../utils/datetime.js";
 // eslint-disable-next-line no-magic-numbers
 const WINDOW_DURATION_MS = 5 * 3600_000;
+const MS_PER_MINUTE = 60000;
+// 过期判断最小间隔（毫秒），同分钟内不重复创建窗口
+const WINDOW_GRACE_PERIOD_MS = MS_PER_MINUTE;
 export class UsageWindowTracker {
     db;
     constructor(db) {
         this.db = db;
     }
-    /** 请求成功后调用，按需创建新窗口 */
+    /** 请求成功后调用，按需创建新窗口（前向模式：窗口 = [now, now + 5h]） */
     recordRequest(providerId, routerKeyId) {
         const now = new Date();
         const latest = getLatestWindow(this.db, routerKeyId, providerId);
-        if (!latest || now > parseDate(latest.end_time)) {
-            const startTime = truncateToMinute(now);
-            insertWindow(this.db, {
-                id: randomUUID(),
-                router_key_id: routerKeyId ?? null,
-                provider_id: providerId,
-                start_time: toSqliteDatetime(startTime),
-                end_time: toSqliteDatetime(new Date(startTime.getTime() + WINDOW_DURATION_MS)),
-            });
+        // 无窗口 → 创建。有窗口但已过期（end_time <= now）且跨分钟 → 新窗口。
+        // 同分钟内的快速调用不重复创建，避免同一分钟内的多次请求产生多个窗口。
+        if (!latest) {
+            createForwardWindow(this.db, now, routerKeyId, providerId);
+        }
+        else if (parseDate(latest.end_time) <= now
+            && now.getTime() - parseDate(latest.end_time).getTime() >= WINDOW_GRACE_PERIOD_MS) {
+            createForwardWindow(this.db, now, routerKeyId, providerId);
         }
     }
-    /** 启动时按活跃 provider 补齐缺失的窗口 */
+    /** 启动时按活跃 provider 补齐缺失的窗口（每个 provider 仅创建一个前向窗口） */
     reconcileOnStartup() {
         const providers = getAllProviders(this.db).filter((p) => p.is_active);
         for (const provider of providers) {
             this.reconcileProvider(provider.id);
         }
     }
-    /** 为单个 provider 补齐窗口 */
+    /** 为单个 provider 补齐窗口：无窗口时基于最新 log 创建前向窗口 */
     reconcileProvider(providerId) {
         const latest = getLatestWindow(this.db, undefined, providerId);
-        const lastLog = this.db.prepare("SELECT created_at FROM request_logs WHERE provider_id = ? ORDER BY created_at DESC LIMIT 1").get(providerId);
-        if (!lastLog)
+        if (latest)
             return;
-        if (!latest) {
-            const firstLog = this.db.prepare("SELECT created_at FROM request_logs WHERE provider_id = ? ORDER BY created_at ASC LIMIT 1").get(providerId);
-            if (!firstLog)
-                return;
-            const truncated = truncateToMinute(parseDate(firstLog.created_at));
-            this.backfillProviderWindows(providerId, truncated);
-            return;
-        }
-        this.backfillProviderWindows(providerId, parseDate(latest.end_time));
-    }
-    /** 从 baseTime 开始，每 5h 一个窗口，直到覆盖 lastLogTime */
-    backfillProviderWindows(providerId, baseTime) {
         const lastLog = this.db.prepare("SELECT created_at FROM request_logs WHERE provider_id = ? ORDER BY created_at DESC LIMIT 1").get(providerId);
         if (!lastLog)
             return;
-        const lastLogTime = parseDate(lastLog.created_at);
-        let windowStart = baseTime;
-        while (windowStart < lastLogTime) {
-            const windowEnd = new Date(windowStart.getTime() + WINDOW_DURATION_MS);
-            insertWindow(this.db, {
-                id: randomUUID(),
-                router_key_id: null,
-                provider_id: providerId,
-                start_time: toSqliteDatetime(windowStart),
-                end_time: toSqliteDatetime(windowEnd),
-            });
-            windowStart = windowEnd;
-        }
+        const anchor = parseDate(lastLog.created_at);
+        createForwardWindow(this.db, anchor, undefined, providerId);
     }
 }
-function truncateToMinute(date) {
-    const d = new Date(date);
-    d.setSeconds(0, 0);
-    return d;
+/** 创建 5h 前向窗口：窗口 = [start, start + 5h]，start 向下取整到分钟 */
+function createForwardWindow(db, anchor, routerKeyId, providerId) {
+    const start = new Date(Math.floor(anchor.getTime() / MS_PER_MINUTE) * MS_PER_MINUTE);
+    const end = new Date(start.getTime() + WINDOW_DURATION_MS);
+    insertWindow(db, {
+        id: randomUUID(),
+        router_key_id: routerKeyId ?? null,
+        provider_id: providerId ?? null,
+        start_time: toSqliteDatetime(start),
+        end_time: toSqliteDatetime(end),
+    });
 }

package/dist/proxy/transform/message-mapper.js

@@ -66,6 +66,8 @@ export function convertMessagesOA2Ant(messages) {
             // tool_calls → tool_use blocks
             if (msg.tool_calls) {
                 for (const tc of msg.tool_calls) {
+                    if (!tc.function)
+                        continue;
                     const input = parseToolArguments(tc.function.arguments);
                     blocks.push({ type: "tool_use", id: sanitizeToolUseId(tc.id), name: tc.function.name, input });
                 }
@@ -160,10 +162,28 @@ export function convertMessagesAnt2OA(system, messages) {
             if (!content?.length)
                 continue;
             const textParts = content.filter((b) => b.type === "text");
+            const imageParts = content.filter((b) => b.type === "image");
             const toolResults = content.filter((b) => b.type === "tool_result");
-            if (textParts.length > 0) {
+            // 仅有 text → 简单字符串 content
+            if (textParts.length > 0 && imageParts.length === 0) {
                 result.push({ role: "user", content: textParts.map(b => b.text).join("") });
             }
+            else if (textParts.length > 0 || imageParts.length > 0) {
+                // 有 image 或混合 → content part 数组
+                const parts = [];
+                for (const tb of textParts) {
+                    parts.push({ type: "text", text: tb.text });
+                }
+                for (const ib of imageParts) {
+                    if (ib.source.type === "base64" && ib.source.data) {
+                        parts.push({ type: "image_url", image_url: { url: `data:${ib.source.media_type};base64,${ib.source.data}` } });
+                    }
+                    else if (ib.source.type === "url" && ib.source.url) {
+                        parts.push({ type: "image_url", image_url: { url: ib.source.url } });
+                    }
+                }
+                result.push({ role: "user", content: parts });
+            }
             for (const tr of toolResults) {
                 let toolCallId = tr.tool_use_id;
                 // 空 tool_use_id → 按顺序配对到预生成的 UUID
@@ -198,7 +218,7 @@ export function convertMessagesAnt2OA(system, messages) {
                 oaiMsg.tool_calls = toolBlocks.map((b, i) => ({
                     id: b.id || (idMap ? idMap.get(i) || randomUUID() : randomUUID()),
                     type: "function",
-                    function: { name: b.name, arguments: JSON.stringify(b.input ?? {}) },
+                    function: { name: b.name ?? "unknown", arguments: JSON.stringify(b.input ?? {}) },
                 }));
             }
             if (oaiMsg.content || oaiMsg.tool_calls) {