mslxdff 0.1.147 → 0.1.149

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mslxdff",
-  "version": "0.1.147",
+  "version": "0.1.149",
   "description": "测试项目，请勿使用。",
   "type": "module",
   "bin": {

package/src/cli/commands/stats.js

@@ -34,20 +34,39 @@ function fmtTps(v) {
   return v == null || !Number.isFinite(v) ? "—" : `${v} tok/s`;
 }
 
-// 中文字符按 2 列宽算，否则表格错位
-function width(s) {
+// 中文字符按 2 列宽算，否则表格错位。
+function width(value) {
   let w = 0;
-  for (const ch of String(s)) w += /[\u1100-\u115F\u2E80-\uA4CF\uAC00-\uD7A3\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFF60\uFFE0-\uFFE6]/.test(ch) ? 2 : 1;
+  for (const ch of String(value ?? "")) w += /[\u1100-\u115F\u2E80-\uA4CF\uAC00-\uD7A3\uF900-\uFAFF\uFE30-\uFE4F\uFF00-\uFF60\uFFE0-\uFFE6]/.test(ch) ? 2 : 1;
   return w;
 }
 
-function padW(s, w) {
-  const t = String(s);
-  return t + " ".repeat(Math.max(0, w - width(t)));
+function padCell(value, w, align = "left") {
+  const text = String(value ?? "");
+  const padding = " ".repeat(Math.max(0, w - width(text)));
+  return align === "right" ? padding + text : text + padding;
 }
 
-function rowText(id, r) {
-  return `  ${padW(id, 30)}  ${padW(r.requests, 6)}  ${padW(fmtTok(r.promptTokens), 8)}  ${padW(fmtTok(r.completionTokens), 10)}  ${padW(fmtTok(r.totalTokens), 8)}  ${padW(fmtMs(r.avgTtfbMs), 7)}  ${padW(fmtMs(r.avgTotalMs), 8)}  ${fmtTps(r.avgTps)}`;
+function renderTable(headers, rows, aligns = []) {
+  const matrix = [headers, ...rows];
+  const widths = headers.map((_, col) => Math.max(...matrix.map((row) => width(row[col]))));
+  const rule = (left, middle, right) => left + widths.map((w) => "─".repeat(w + 2)).join(middle) + right;
+  const line = (row) => `│${row.map((cell, col) => ` ${padCell(cell, widths[col], aligns[col])} `).join("│")}│`;
+  return [
+    rule("┌", "┬", "┐"),
+    line(headers),
+    rule("├", "┼", "┤"),
+    ...rows.map(line),
+    rule("└", "┴", "┘"),
+  ].join("\n");
+}
+
+function tokenRow(id, r) {
+  return [id, r.requests, fmtTok(r.promptTokens), fmtTok(r.completionTokens), fmtTok(r.reasoningTokens), fmtTok(r.totalTokens)];
+}
+
+function performanceRow(id, r) {
+  return [id, fmtMs(r.avgTtfbMs), fmtMs(r.avgTotalMs), fmtTps(r.avgTps)];
 }
 
 export function renderStats(report, { hours = 24, model = null } = {}) {
@@ -59,15 +78,30 @@ export function renderStats(report, { hours = 24, model = null } = {}) {
     lines.push("说明：-chat 直连 mimo/big-pickle 不经网关，不计入本表");
     return lines.join("\n");
   }
-  lines.push(`模型用量（近 ${hours}h · 成功请求 ${totals.requests} 次 · ${models.length} 个模型）`);
-  lines.push(`  ${padW("模型", 30)}  ${padW("请求", 6)}  ${padW("prompt", 8)}  ${padW("输出", 10)}  ${padW("合计", 8)}  ${padW("首字", 7)}  ${padW("总耗时", 8)}  速度`);
-  for (const m of models) lines.push(rowText(m.id, m));
-  lines.push(`  ${"-".repeat(76)}`);
-  lines.push(rowText("合计", totals));
-  if (totals.reasoningTokens > 0) lines.push(`  其中思考 tokens：${fmtTok(totals.reasoningTokens)}`);
+
+  const right = "right";
+  const tokenRows = [...models.map((m) => tokenRow(m.id, m)), tokenRow("合计", totals)];
+  const performanceRows = [...models.map((m) => performanceRow(m.id, m)), performanceRow("合计", totals)];
+  lines.push(`模型用量报告（近 ${hours}h${model ? ` · 筛选 ${model}` : ""}）`);
+  lines.push(`成功请求：${totals.requests} 次 · 模型：${models.length} 个`);
+  lines.push("");
+  lines.push("Token 用量");
+  lines.push(renderTable(["模型", "请求", "输入", "输出", "思考", "合计"], tokenRows, ["left", right, right, right, right, right]));
+  lines.push("");
+  lines.push("响应性能");
+  lines.push(renderTable(["模型", "首字", "总耗时", "速度"], performanceRows, ["left", right, right, right]));
   lines.push("");
   lines.push("说明：速度 = 输出 tokens ÷ 生成耗时（总耗时−首字），按窗口加权；只统计成功请求。");
-  lines.push(`      -chat 直连 mimo/big-pickle 不经 8989 网关，不计入。数据保留 ${usageKeepDays()} 天，mslxdff -stats --hours 1|--json|--model <id> 可调。`);
+  lines.push("范围：只含经 8989 网关的成功请求；不含失败请求和 -chat 直连。");
+  const keepDays = usageKeepDays();
+  if (hours > keepDays * 24) {
+    lines.push(`警告：查询 ${hours}h 超过数据保留 ${keepDays} 天，历史可能不完整。`);
+  } else {
+    lines.push(`数据保留 ${keepDays} 天；更早的历史已删除。`);
+  }
+  lines.push("明细口径：本表按模型聚合，不展开 via、interrupted 和单次 tps。");
+  lines.push("数值使用 k/M 缩写；需要精确值或机器处理请加 --json。");
+  lines.push("可调：mslxdff -stats --hours 1 | --model <id> | --json");
   return lines.join("\n");
 }
 
@@ -85,4 +119,4 @@ export async function handleStats(args) {
   }
   console.log(renderStats(report, { hours, model }));
   return true;
-}
+}

package/src/responses/translate.js

@@ -54,6 +54,9 @@ export function responsesToChatBody(req = {}) {
   // 客户端重试/重放历史时会把同一 item 存两份），故按 id 保首个、丢后续——重复项无合法语义，删了不吃亏。
   let pendingReasoning = [];
   const seenReasoningIds = new Set();
+  // 同 call_id 的 function_call_output 重复出现 → 上游 400 "Duplicate function_call_output"
+  // （2026-09-23 实测，客户端重试/重放历史时会把同一工具结果存两份），故同样按 call_id 保首个、丢后续。
+  const seenToolResultIds = new Set();
   for (const it of items) {
     if (!it || typeof it !== "object") continue;
     if (it.type === "reasoning") {
@@ -81,6 +84,8 @@ export function responsesToChatBody(req = {}) {
       if (pendingReasoning.length) { msg.reasoning_items = pendingReasoning; pendingReasoning = []; }
       messages.push(msg);
     } else if (it.type === "function_call_output") {
+      const _tkey = String(it.call_id || "");
+      if (_tkey) { if (seenToolResultIds.has(_tkey)) continue; seenToolResultIds.add(_tkey); }
       messages.push({ role: "tool", tool_call_id: it.call_id || "", content: typeof it.output === "string" ? it.output : JSON.stringify(it.output ?? "") });
     }
   }

package/src/upstream-engine/sdk/convert.js

@@ -62,6 +62,9 @@ export function toModelPrompt(messages, { dropEncrypted = false } = {}) {
   // （上游报错原文即要求 Remove duplicate items）。这里按 itemId 保首个、丢后续，
   // 防客户端重放/其他生产者把同一加密 item 组装两次。
   const seenReasoningIds = new Set();
+  // 同 toolCallId 的 tool 结果重复出现 → 上游 400 "Duplicate function_call_output"
+  // （2026-09-23 实测：responses 入站虽已去重，此处仍加防线，防其他生产者直接组装 chat messages 重放）。
+  const seenToolResultIds = new Set();
   for (const m of Array.isArray(messages) ? messages : []) {
     if (!m || typeof m !== "object") continue;
     const role = String(m.role || "");
@@ -112,6 +115,8 @@ export function toModelPrompt(messages, { dropEncrypted = false } = {}) {
       }
       out.push({ role: "assistant", content: parts });
     } else if (role === "tool") {
+      const _tkey = String(m.tool_call_id || "");
+      if (_tkey) { if (seenToolResultIds.has(_tkey)) continue; seenToolResultIds.add(_tkey); }
       out.push({
         role: "tool",
         content: [{

package/src/upstream-engine/sdk/diagnose.js

@@ -24,6 +24,7 @@ export function diagnoseToolSequence(messages) {
   const list = Array.isArray(messages) ? messages : [];
   const issues = [];
   const open = new Map();
+  const seenResults = new Set();
   let calls = 0;
   let results = 0;
   const first = list[0];
@@ -50,8 +51,8 @@ export function diagnoseToolSequence(messages) {
       results++;
       const id = String(m.tool_call_id || "");
       if (!id) issues.push(`#${i} tool 结果空 id`);
-      else if (!open.has(id)) issues.push(`#${i} 孤立结果:${id}`);
-      else open.delete(id);
+      else if (seenResults.has(id)) issues.push(`#${i} 结果重复:${id}（上游按 call_id 查重会 400 Duplicate function_call_output，去重后只应出现一次）`);
+      else { seenResults.add(id); if (!open.has(id)) issues.push(`#${i} 孤立结果:${id}`); else open.delete(id); }
     } else if (open.size) {
       issues.push(`#${i} ${role} 打断{${[...open.keys()].join(",")}}`);
     }