minecodex 2.0.26 → 2.0.27

package/features/session-status/src/adapters/opencodex/usage-log.mjs

@@ -10,26 +10,16 @@ function usageRecord(row) {
     || !Number.isFinite(row.timestamp) || !Number.isFinite(row.durationMs) || row.durationMs < 0) return null;
   return { id:row.requestId, conversationId:row.conversationId, start:row.timestamp,
     end:row.timestamp+row.durationMs, duration:row.durationMs,
-    first:row.firstOutputMs, generationStart:row.genStartMs, generationEnd:row.lastOutputMs,
     usageStatus:row.usageStatus, input:row.usage?.inputTokens, cached:row.usage?.cachedInputTokens ?? 0,
     output:row.usage?.outputTokens };
 }
 
-function decodeMeasurement(record) {
+function requestMeasurement(record) {
   const unavailable = reason => ({source:"ocx",output:record.output,elapsed:null,reason});
   if (record.usageStatus === "unsupported") return unavailable("usage_unsupported");
   if (!Number.isFinite(record.output) || record.output <= 0) return unavailable("output_missing");
-  let elapsed;
-  if (Number.isFinite(record.generationStart) && Number.isFinite(record.generationEnd)) {
-    elapsed=record.generationEnd-record.generationStart;
-  } else {
-    if (record.first === undefined) return unavailable("ttft_missing");
-    if (!Number.isFinite(record.first) || record.first < 0) return unavailable("invalid_duration");
-    elapsed=record.duration-record.first;
-  }
-  if (!Number.isFinite(elapsed) || elapsed <= 0) return unavailable("invalid_duration");
-  if (elapsed < 1000) return unavailable("decode_window_too_short");
-  return {source:"ocx",output:record.output,elapsed,reason:null};
+  if (!Number.isFinite(record.duration) || record.duration <= 0) return unavailable("invalid_duration");
+  return {source:"ocx",output:record.output,elapsed:record.duration,reason:null};
 }
 
 export class OpenCodexUsageReader {
@@ -85,6 +75,6 @@ export class OpenCodexUsageReader {
       owners.set(record.id,(owners.get(record.id) ?? 0)+1);
     }
     return new Map([...candidates].filter(([,record])=>owners.get(record.id) === 1)
-      .map(([id,record])=>[id,decodeMeasurement(record)]));
+      .map(([id,record])=>[id,requestMeasurement(record)]));
   }
 }

package/features/session-status/src/domain/session-stats.mjs

@@ -104,38 +104,16 @@ export function applySessionStatusEvent(state, event) {
 }
 
 export function sessionStatusSnapshot(state, threadId, measurements = new Map()) {
-  let decodeTokens = 0;
-  let decodeMs = 0;
-  let speedSamples = 0;
-  const turnSpeeds = new Map();
-  let unavailableSource = "codex", unavailableReason = "timing_missing";
-  for (const sample of state.speedMeasurements) {
-    const measurement = measurements.get(sample.id);
-    const source = measurement?.source ?? "codex";
-    const elapsed = measurement ? measurement.elapsed : sample.start == null ? null
-      : sample.end - sample.start - boundedToolWaitMs(sample.tools, sample.start, sample.end, sample.outputs);
-    if (!sample.turnId) continue;
-    unavailableSource=source;
-    unavailableReason=measurement?.reason ?? (Number.isFinite(elapsed) && elapsed > 0 && elapsed < 1000
-      ? "decode_window_too_short" : "timing_missing");
-    if (!Number.isFinite(elapsed) || elapsed < 1000) continue;
-    const turn = turnSpeeds.get(sample.turnId) ?? { tokens:0, ms:0, samples:0, sources:new Set() };
-    turn.tokens += measurement?.output ?? sample.output;
-    turn.ms += elapsed;
-    turn.samples += 1;
-    turn.sources.add(source);
-    turnSpeeds.set(sample.turnId, turn);
-  }
-  // 按回合顺序取最近五个有效回合；同轮多步合并，无数据的回合不占名额。
-  const recentTurns = [...state.turns].filter(id => turnSpeeds.has(id)).slice(-5);
-  const speedSources = new Set();
-  for (const id of recentTurns) {
-    const turn = turnSpeeds.get(id);
-    decodeTokens += turn.tokens;
-    decodeMs += turn.ms;
-    speedSamples += turn.samples;
-    for (const source of turn.sources) speedSources.add(source);
-  }
+  const sample = state.speedMeasurements.at(-1);
+  const measurement = measurements.get(sample?.id);
+  const source = measurement?.source ?? "codex";
+  const elapsed = measurement ? measurement.elapsed : sample?.start == null ? null
+    : sample.end - sample.start - boundedToolWaitMs(sample.tools, sample.start, sample.end, sample.outputs);
+  const valid = Boolean(sample?.turnId) && Number.isFinite(elapsed) && elapsed > 0
+    && (source === "ocx" || elapsed >= 1000);
+  const output = measurement?.output ?? sample?.output;
+  const unavailableReason = measurement?.reason ?? (Number.isFinite(elapsed) && elapsed > 0 && elapsed < 1000
+    ? "decode_window_too_short" : "timing_missing");
   const total = state.total;
   const input = total?.input ?? 0;
   const cached = total?.cached ?? 0;
@@ -154,11 +132,11 @@ export function sessionStatusSnapshot(state, threadId, measurements = new Map())
     uncachedInputTokens: total ? Math.max(0, input - cached - cacheWrite) : null,
     outputTokens: total?.output ?? null,
     cacheHitPercent: input > 0 ? Math.round(cached / input * 100) : null,
-    observedTps: decodeMs > 0 ? Math.round(decodeTokens / (decodeMs / 1000)) : null,
-    speedSamples,
-    speedSource: speedSources.size > 1 ? "mixed" : [...speedSources][0] ?? unavailableSource,
-    speedUnavailableReason: decodeMs > 0 ? null : unavailableReason,
-    observedModelMs: decodeMs,
+    observedTps: valid ? Math.round(output / (elapsed / 1000)) : null,
+    speedSamples: valid ? 1 : 0,
+    speedSource: source,
+    speedUnavailableReason: valid ? null : unavailableReason,
+    observedModelMs: valid ? elapsed : 0,
     toolMs: state.toolMs,
     averageFirstTokenMs: state.ttftSamples > 0 ? Math.round(state.ttftTotalMs / state.ttftSamples) : null,
     contextUsedTokens: contextUsed,

package/features/session-status/src/session-status.mjs

@@ -8,9 +8,9 @@ const copyByLocale = { "zh-CN": {
   sum: "合计", capacity: "窗口容量", contextShare: "上下文占用", compactions: "压缩次数",
   instructions: "指令", messages: "消息", toolHistory: "工具交互", other: "未分类",
   speedHelp: "关于 TPS", speedInfo: "根据会话日志估算生成速度，包含推理输出。",
-  speedInfoOcx: "根据 OCX 记录估算生成速度，包含推理输出。",
-  speedInfoMixed: "根据 OCX 记录和会话日志估算生成速度，包含推理输出。",
-  speedWindow: "取最近 5 个有有效数据的回合，不足 5 轮时按已有数据计算，仅供参考。",
+  speedInfoOcx: "根据 OCX 记录计算响应速度，包含推理输出和请求等待时间。",
+  speedWindow: "取最近一次已完成响应的数据，仅供参考。",
+  speedWindowOcx: "取最近一次请求的记录，与 OCX 的 TPS 一致。",
   speedUnavailable: "有效计时不足，暂无法估算。",
 }, en: {
   turns: "turns", steps: "steps", speed: "TPS", cache: "Cache", cacheDetail: "Cache hit",
@@ -19,9 +19,9 @@ const copyByLocale = { "zh-CN": {
   sum: "Sum", capacity: "Window size", contextShare: "Context used", compactions: "Compactions",
   instructions: "Instructions", messages: "Messages", toolHistory: "Tool activity", other: "Unclassified",
   speedHelp: "About TPS", speedInfo: "Generation speed estimated from session logs, including reasoning output.",
-  speedInfoOcx: "Generation speed estimated from OCX records, including reasoning output.",
-  speedInfoMixed: "Generation speed estimated from OCX records and session logs, including reasoning output.",
-  speedWindow: "Uses the latest 5 turns with valid data, or fewer when unavailable. For reference only.",
+  speedInfoOcx: "Response speed calculated from OCX records, including reasoning output and request waiting time.",
+  speedWindow: "Uses the latest completed response. For reference only.",
+  speedWindowOcx: "Uses the latest request record, matching OCX TPS.",
   speedUnavailable: "Not enough valid timing data to estimate speed.",
 } };
 function selectedCopy() {
@@ -31,8 +31,9 @@ function selectedCopy() {
 
 function speedTooltip(value, copy) {
   const source = value.speedSource === "ocx" ? copy.speedInfoOcx
-    : value.speedSource === "mixed" ? copy.speedInfoMixed : copy.speedInfo;
-  return `${source} ${value.observedTps == null ? copy.speedUnavailable : copy.speedWindow}`;
+    : copy.speedInfo;
+  const window = value.speedSource === "ocx" ? copy.speedWindowOcx : copy.speedWindow;
+  return `${source} ${value.observedTps == null ? copy.speedUnavailable : window}`;
 }
 
 // 图标来自 Lucide Static 与 Phosphor Icons；许可见 vendor/。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecodex",
-  "version": "2.0.26",
+  "version": "2.0.27",
   "description": "Lightweight, local-first plugins for the Codex desktop app.",
   "license": "MIT",
   "type": "module",