minecodex 2.0.24 → 2.0.26

package/features/session-status/src/adapters/codex/context-usage.mjs

@@ -1,3 +1,10 @@
+export function contextUsageExport(source) {
+  // 新版从宿主感知的 tokenUsageInfo selector 派生 thread atom family。
+  const selector = source.match(/([\w$]+)=[\w$]+\(([`"'])tokenUsageInfo\2\),([\w$]+)=[\w$]+\(/);
+  const local = selector?.[3] ?? source.match(/([\w$]+)=[\w$]+\(\(\{latestTokenUsageInfo:/)?.[1];
+  return local ? [...source.matchAll(/([\w$]+) as ([\w$]+)/g)].find(match => match[1] === local)?.[2] ?? null : null;
+}
+
 // 原生 atom、scope 和 bundle 字段不进入状态栏呈现层。
 export function createContextUsageAdapter(signal, codex, onChange, loadFamily = null) {
   let family=null, thread=null, composer=null, unsubscribe=null;
@@ -34,8 +41,7 @@ export function createContextUsageAdapter(signal, codex, onChange, loadFamily =
     const url=[...document.querySelectorAll('link[rel=modulepreload]')].map(link=>link.href).find(url=>/\/app-shared-[^/]+\.js(?:$|\?)/.test(url));
     if (!url) throw new Error("context-bundle-unavailable");
     const source=await (await fetch(url,{signal})).text();
-    const local=source.match(/([\w$]+)=[\w$]+\(\(\{latestTokenUsageInfo:/)?.[1];
-    const exported=[...source.matchAll(/([\w$]+) as ([\w$]+)/g)].find(match=>match[1]===local)?.[2];
+    const exported=contextUsageExport(source);
     if (!exported) throw new Error("context-export-unavailable");
     return (await import(url))[exported];
   }

package/features/session-status/src/adapters/codex/session-log.mjs

@@ -77,6 +77,11 @@ export function sessionFacts(record) {
     }
     if (p.type === "token_count") emit("usage-observed", { total:usage(p.info?.total_token_usage), last:usage(p.info?.last_token_usage), contextWindow:p.info?.model_context_window });
   }
-  if (record?.type === "token_usage_record") emit("response-measured", { id:p.response_id, total:usage(p.thread_token_usage), last:usage(p.usage), end:Date.parse(at) });
+  if (record?.type === "token_usage_record") {
+    // 外部模型可能没有响应 ID；序号只在所属 rollout 会话内唯一。
+    const id = p.response_id || (p.session_id && Number.isSafeInteger(record.ordinal) && record.ordinal >= 0
+      ? JSON.stringify(["usage-record", p.session_id, record.ordinal]) : null);
+    emit("response-measured", { id, total:usage(p.thread_token_usage), last:usage(p.usage), end:Date.parse(at) });
+  }
   return facts;
 }

package/features/session-status/src/adapters/codex/session-reader.mjs

@@ -4,8 +4,11 @@ import os from "node:os";
 import path from "node:path";
 
 import { sessionFacts } from "./session-log.mjs";
+import { OpenCodexUsageReader } from "../opencodex/usage-log.mjs";
 import { createSessionState, applySessionStatusEvent, sessionStatusSnapshot } from "../../domain/session-stats.mjs";
 
+const defaultUsageReader = new OpenCodexUsageReader();
+
 const THREAD_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 export function threadIdFromLocation(value) {
   return String(value ?? "").match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i)?.[0] ?? null;
@@ -35,11 +38,12 @@ async function findLogs(directory, threadId) {
 }
 
 export class SessionStatusReader {
-  constructor({ sessionsDir = path.join(process.env.CODEX_HOME ?? path.join(os.homedir(), ".codex"), "sessions"), now = Date.now } = {}) {
+  constructor({ sessionsDir = path.join(process.env.CODEX_HOME ?? path.join(os.homedir(), ".codex"), "sessions"), now = Date.now, ocxUsagePath } = {}) {
     this.sessionsDir = sessionsDir;
     this.now = now;
     this.states = new Map();
     this.missingChecks = new Map();
+    this.ocxUsage = ocxUsagePath === undefined ? defaultUsageReader : new OpenCodexUsageReader(ocxUsagePath);
   }
 
   retryAfterMs(threadId) {
@@ -101,6 +105,7 @@ export class SessionStatusReader {
     events.sort((left, right) => (Date.parse(left.timestamp) || 0) - (Date.parse(right.timestamp) || 0));
     for (const event of events) for (const fact of sessionFacts(event)) applySessionStatusEvent(state, fact);
     this.states.set(threadId, state);
-    return sessionStatusSnapshot(state, threadId);
+    const measurements = await this.ocxUsage.measurements(threadId, state.speedMeasurements);
+    return sessionStatusSnapshot(state, threadId, measurements);
   }
 }

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

@@ -0,0 +1,90 @@
+import { createHash } from "node:crypto";
+import { createReadStream } from "node:fs";
+import { stat } from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+// OCX usage.jsonl 的数值投影；不读取配置、密钥或对话正文。
+function usageRecord(row) {
+  if (typeof row.requestId !== "string" || typeof row.conversationId !== "string"
+    || !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) {
+  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};
+}
+
+export class OpenCodexUsageReader {
+  constructor(filePath=path.join(process.env.OPENCODEX_HOME?.trim() || path.join(os.homedir(),".opencodex"),"usage.jsonl")) {
+    this.filePath=filePath;this.offset=0;this.pending="";this.identity=null;
+    this.conversations=new Map();this.refreshing=null;
+  }
+
+  refresh() {
+    if (!this.refreshing) this.refreshing=this.readAppend().finally(()=>{this.refreshing=null;});
+    return this.refreshing;
+  }
+
+  async readAppend() {
+    let file;
+    try { file=await stat(this.filePath); }
+    catch(error) {
+      if (!["ENOENT","EACCES","EPERM"].includes(error.code)) throw error;
+      this.offset=0;this.pending="";this.identity=null;this.conversations.clear();return;
+    }
+    const identity=`${file.dev}:${file.ino}`;
+    if (identity !== this.identity || file.size < this.offset) {
+      this.offset=0;this.pending="";this.conversations.clear();this.identity=identity;
+    }
+    if (file.size === this.offset) return;
+    const stream=createReadStream(this.filePath,{start:this.offset,end:file.size-1,encoding:"utf8"});
+    for await(const chunk of stream) {
+      const lines=(this.pending+chunk).split("\n");this.pending=lines.pop() ?? "";
+      for(const line of lines) {
+        let record;
+        try {record=usageRecord(JSON.parse(line));} catch {continue;}
+        if (!record) continue;
+        let records=this.conversations.get(record.conversationId);
+        if (!records) this.conversations.set(record.conversationId,records=new Map());
+        records.set(record.id,record);
+      }
+    }
+    this.offset=file.size;
+  }
+
+  async measurements(threadId,samples) {
+    await this.refresh();
+    const conversationId=createHash("sha256").update(threadId).digest("hex").slice(0,32);
+    const records=[...(this.conversations.get(conversationId)?.values() ?? [])];
+    const candidates=new Map(),owners=new Map();
+    for(const sample of samples) {
+      // 同会话、完整用量相等且完成相邻才可关联；同一请求不能归属两个响应。
+      const matches=records.filter(record=>Number.isFinite(record.input) && Number.isFinite(record.output)
+        && record.input === sample.input && record.cached === sample.cached && record.output === sample.output
+        && record.start <= sample.end && Math.abs(record.end-sample.end) <= 2000);
+      if (matches.length !== 1) continue;
+      const record=matches[0];candidates.set(sample.id,record);
+      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)]));
+  }
+}

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

@@ -90,8 +90,9 @@ export function applySessionStatusEvent(state, event) {
       if (event.id) {
         state.responses.add(event.id);
         const output=event.last?.output;
-        if (Number.isFinite(output) && output > 0 && state.firstOutputAt != null && Number.isFinite(event.end) && event.end > state.firstOutputAt)
-          state.speedMeasurements.push({ turnId:state.currentTurnId,start:state.firstOutputAt,end:event.end,output,
+        if (Number.isFinite(output) && output > 0 && Number.isFinite(event.end))
+          state.speedMeasurements.push({ id:event.id,turnId:state.currentTurnId,start:state.firstOutputAt,end:event.end,output,
+            input:event.last.input,cached:event.last.cached,
             outputs:state.pendingOutputIntervals.slice(),tools:state.pendingToolIntervals.slice() });
       }
       reset();
@@ -102,27 +103,38 @@ export function applySessionStatusEvent(state, event) {
   if (state.total || state.turns.size) state.updatedAt=event.at ?? state.updatedAt;
 }
 
-export function sessionStatusSnapshot(state, threadId) {
+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 elapsed = sample.end - sample.start - boundedToolWaitMs(sample.tools, sample.start, sample.end, sample.outputs);
-    if (!sample.turnId || !Number.isFinite(elapsed) || elapsed <= 0) continue;
-    const turn = turnSpeeds.get(sample.turnId) ?? { tokens:0, ms:0, samples:0 };
-    turn.tokens += sample.output;
+    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 total = state.total;
   const input = total?.input ?? 0;
@@ -144,6 +156,8 @@ export function sessionStatusSnapshot(state, threadId) {
     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,
     toolMs: state.toolMs,
     averageFirstTokenMs: state.ttftSamples > 0 ? Math.round(state.ttftTotalMs / state.ttftSamples) : null,

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

@@ -1,6 +1,6 @@
 import { readFile } from "node:fs/promises";
-import { createContextUsageAdapter } from "./adapters/codex/context-usage.mjs";
+import { contextUsageExport, createContextUsageAdapter } from "./adapters/codex/context-usage.mjs";
 export async function createPageScriptSource() {
   const source=await readFile(new URL("./session-status.mjs",import.meta.url),"utf8");
-  return `const createContextUsageAdapter=${createContextUsageAdapter.toString()};\n${source}`;
+  return `const contextUsageExport=${contextUsageExport.toString()};\nconst createContextUsageAdapter=${createContextUsageAdapter.toString()};\n${source}`;
 }

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

@@ -7,20 +7,34 @@ const copyByLocale = { "zh-CN": {
   firstToken: "平均首字延迟", input: "输入", cached: "缓存输入", output: "输出",
   sum: "合计", capacity: "窗口容量", contextShare: "上下文占用", compactions: "压缩次数",
   instructions: "指令", messages: "消息", toolHistory: "工具交互", other: "未分类",
-  speedHelp: "关于 TPS", speedInfo: "GPT 等模型不公开完整思考过程及逐 Token 生成时间。TPS 取最近 5 个有有效数据的回合，不足 5 轮时按已有数据计算。它是基于可观测事件估算的体感响应速度，仅供参考，不代表模型真实的 Token 生成速度。",
+  speedHelp: "关于 TPS", speedInfo: "根据会话日志估算生成速度，包含推理输出。",
+  speedInfoOcx: "根据 OCX 记录估算生成速度，包含推理输出。",
+  speedInfoMixed: "根据 OCX 记录和会话日志估算生成速度，包含推理输出。",
+  speedWindow: "取最近 5 个有有效数据的回合，不足 5 轮时按已有数据计算，仅供参考。",
+  speedUnavailable: "有效计时不足，暂无法估算。",
 }, en: {
   turns: "turns", steps: "steps", speed: "TPS", cache: "Cache", cacheDetail: "Cache hit",
   statistics: "Session stats", usage: "Token usage", context: "Context", total: "Total",
   firstToken: "Avg first token", input: "Input", cached: "Cached input", output: "Output",
   sum: "Sum", capacity: "Window size", contextShare: "Context used", compactions: "Compactions",
   instructions: "Instructions", messages: "Messages", toolHistory: "Tool activity", other: "Unclassified",
-  speedHelp: "About TPS", speedInfo: "Models such as GPT do not expose their full reasoning process or per-token generation timing. TPS uses the latest 5 turns with valid timing data, or fewer if unavailable. It estimates perceived response speed from observable events, rather than the model’s actual token generation speed.",
+  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.",
+  speedUnavailable: "Not enough valid timing data to estimate speed.",
 } };
 function selectedCopy() {
   const language = document.documentElement.lang || navigator.languages?.[0] || navigator.language || "en";
   return String(language).toLowerCase().startsWith("zh") ? copyByLocale["zh-CN"] : copyByLocale.en;
 }
 
+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}`;
+}
+
 // 图标来自 Lucide Static 与 Phosphor Icons；许可见 vendor/。
 const icons = {
   // Lucide info，使用官方 SVG 路径。
@@ -365,7 +379,7 @@ function showPanel(kind) {
     const speedLabel = row(dl, copy.speed, snapshot.observedTps == null ? "—" : `${number(snapshot.observedTps)} tok/s`);
     speedLabel.className = "tps-label";
     tpsInfo.setAttribute("aria-label", copy.speedHelp);
-    tpsInfo.setAttribute("data-minecodex-tooltip", copy.speedInfo);
+    tpsInfo.setAttribute("data-minecodex-tooltip", speedTooltip(snapshot, copy));
     speedLabel.append(tpsInfo);
   } else if (kind === "usage") {
     row(dl, copy.total, tokenValue(snapshot.totalTokens));

package/package.json

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