mslxdff 0.1.129 → 0.1.131

package/package.json

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

package/src/chat/cooling.js

@@ -79,21 +79,3 @@ export function createCooling({
 
   return { isCooling, isCoolingAsync, recordError, recordChatError, recordOk, recordChatOk };
 }
-
-// 默认实例（对接真实 state.js）
-let _default = null;
-export function getDefaultCooling() {
-  if (_default) return _default;
-  // 懒加载 state，避免循环
-  _default = createCooling({
-    loadModelErrors: () => {
-      try { const s = require("../state.js"); return s.loadModelErrors(); } catch { return {}; }
-    },
-    saveModelErrors: (o) => { try { const s = require("../state.js"); s.saveModelErrors(o); } catch {} },
-    loadModelLatencies: () => { try { const s = require("../state.js"); return s.loadModelLatencies(); } catch { return {}; } },
-    saveModelLatencies: (o) => { try { const s = require("../state.js"); s.saveModelLatencies(o); } catch {} },
-    flush: () => { try { const s = require("../state.js"); s.flushStateSync(); } catch {} },
-    now: () => Date.now(),
-  });
-  return _default;
-}

package/src/chat/gateway.js

@@ -24,8 +24,14 @@ export function createGatewayClient({
       return String(loaded?.token || "").trim();
     } catch { return ""; }
   });
-  const _getPort = getPort || (() => {
-    try { const s = require("../state.js"); const p = s.getPort(); if (Number.isInteger(p) && p > 0) return p; } catch {}
+  // 默认实现与 loadToken/readModelsJson 同款：懒加载 state（ESM 里没有 require）
+  // Note: 这里曾用 require 导致 state.port 被静默忽略 — 见 .agents/notes/implemented/bug-fix/2026-09-17-esm-dead-require-and-orphan-cooling.md
+  const _getPort = getPort || (async () => {
+    try {
+      const s = await import("../state.js");
+      const p = s.getPort();
+      if (Number.isInteger(p) && p > 0) return p;
+    } catch {}
     const v = Number(env.MSLXDFF_PORT);
     if (Number.isInteger(v) && v > 0) return v;
     return defaultPort;
@@ -48,7 +54,7 @@ export function createGatewayClient({
     let token = "";
     try {
       token = String((await _loadToken()) || "").trim();
-      const p = _getPort();
+      const p = await _getPort();
       if (Number.isInteger(p) && p > 0) port = p;
     } catch {}
     if (!token) {

package/src/chat/tools.js

@@ -7,6 +7,7 @@ import { FORBIDDEN } from "./config.js";
 import { logDir } from "../logs.js";
 import { defaultStateFile, loadProviderKeys, loadProviderConfigs } from "../state.js";
 import { compatFetch } from "../compat.js";
+import { opencodeClientIdentity } from "../opencode-identity.js";
 
 const pkgRoot = resolve(dirname(fileURLToPath(import.meta.url)), "../..");
 const allowedRoots = [
@@ -220,12 +221,17 @@ export async function curlTool({ url, method, headers, body, timeoutMs }) {
   if (headers && typeof headers === "object") {
     for (const [k, v] of Object.entries(headers)) if (typeof v === "string") h[String(k)] = v;
   }
-  // 上游自动补最小可用头
+  // 上游自动补最小可用头（zen 免费层门禁：UA 带版本 + opencode 形状 session/request）
   if (/opencode\.ai/i.test(target)) {
+    const ident = opencodeClientIdentity();
     if (!h["x-opencode-client"]) h["x-opencode-client"] = "desktop";
     if (!h["Authorization"] && !h["authorization"]) h["Authorization"] = "Bearer public";
     if (!h["Accept"]) h["Accept"] = m === "GET" ? "*/*" : "application/json";
     if (!h["Content-Type"] && m !== "GET" && m !== "HEAD") h["Content-Type"] = "application/json";
+    if (!h["User-Agent"] && !h["user-agent"]) h["User-Agent"] = ident["User-Agent"];
+    if (!h["x-opencode-session"]) h["x-opencode-session"] = ident["x-opencode-session"];
+    if (!h["x-opencode-request"]) h["x-opencode-request"] = ident["x-opencode-request"];
+    if (!h["x-opencode-project"]) h["x-opencode-project"] = "global";
   }
   // 本机自动带 token（/v1/* 需要鉴权）；/v1/models 必须是 GET，模型常误用 POST 直接纠正
   if (/127\.0\.0\.1|localhost/i.test(target) && /\/v1\//i.test(target)) {

package/src/cli/commands/provider/bench-via.js

@@ -5,6 +5,7 @@ import { runOne } from "../../../bench/runner.js";
 import { formatViaReport } from "../../../bench/report.js";
 import { clineBenchOne } from "../../../bench/cline-bench.js";
 import { workbuddyBenchOne } from "../../../bench/workbuddy-bench.js";
+import { opencodeClientIdentity } from "../../../opencode-identity.js";
 
 export function buildHeadersForProvider(providerId, apiKey, auth) {
   const h = {};
@@ -21,6 +22,16 @@ export function buildHeadersForProvider(providerId, apiKey, auth) {
     if (auth?.enterpriseId) { h["X-Enterprise-Id"] = auth.enterpriseId; h["X-Tenant-Id"] = auth.enterpriseId; }
     return h;
   }
+  // opencode 免费层门禁：UA 带版本 + opencode 形状 session/request，否则 403
+  if (String(providerId).toLowerCase() === "opencode") {
+    const ident = opencodeClientIdentity();
+    h["Content-Type"] = "application/json";
+    if (!h["User-Agent"]) h["User-Agent"] = ident["User-Agent"];
+    h["x-opencode-client"] = "desktop";
+    h["x-opencode-session"] = ident["x-opencode-session"];
+    h["x-opencode-request"] = ident["x-opencode-request"];
+    h["x-opencode-project"] = "global";
+  }
   if (apiKey) h["Authorization"] = `Bearer ${apiKey}`;
   return h;
 }

package/src/metrics.js

@@ -47,7 +47,6 @@ export function extractUsageFromSseText(sseText) {
     try {
       const j = JSON.parse(data);
       if (j.usage) return extractUsageFromJson(j);
-      if (j.choices?.[0]?.finish_reason && j.usage) return extractUsageFromJson(j);
     } catch {}
   }
   return null;

package/src/opencode-identity.js

@@ -0,0 +1,51 @@
+import crypto from "node:crypto";
+
+// opencode 客户端身份规格单一来源（源码 packages/schema/src/identifier.ts +
+// packages/opencode/src/session/llm/request.ts）：id = <prefix>_ + 12 位 hex
+// (timestamp*4096+同毫秒计数，截 48bit) + 14 位 base62，共 26 字符；UA 必须 "opencode/<semver>"。
+// zen 免费层 2026-09-17 起按该规格放行（缺版本 UA 或 id 形状不符 → 403 FreeTierError）。
+const ID_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+const DEFAULT_OPENCODE_UA = "opencode/1.17.20";
+let idLastTs = 0;
+let idCounter = 0;
+
+export function opencodeIdTail(timestamp = Date.now()) {
+  if (timestamp !== idLastTs) {
+    idLastTs = timestamp;
+    idCounter = 0;
+  }
+  idCounter += 1;
+  const value = BigInt(timestamp) * 0x1000n + BigInt(idCounter);
+  let tail = "";
+  for (let i = 0; i < 6; i++) {
+    tail += Number((value >> BigInt(40 - 8 * i)) & 0xffn)
+      .toString(16)
+      .padStart(2, "0");
+  }
+  for (const b of crypto.randomBytes(14)) tail += ID_CHARS[b % 62];
+  return tail;
+}
+
+// 摘要派生：同种子恒同 id（会话亲和），形态仍合规
+export function digestIdTail(digest) {
+  let tail = digest.subarray(0, 6).toString("hex");
+  for (const b of digest.subarray(6, 20)) tail += ID_CHARS[b % 62];
+  return tail;
+}
+
+export function genId(prefix) {
+  return `${prefix}${opencodeIdTail()}`;
+}
+
+export function opencodeUa() {
+  return process.env.MSLXDFF_OPENCODE_UA || DEFAULT_OPENCODE_UA;
+}
+
+// 旁路（-chat curl 工具 / bench 直连）共用同一身份，避免各自伪造头再被 403
+export function opencodeClientIdentity() {
+  return {
+    "User-Agent": opencodeUa(),
+    "x-opencode-session": genId("ses_"),
+    "x-opencode-request": genId("msg_"),
+  };
+}

package/src/providers/workbuddy/account-store.js

@@ -1,19 +1,33 @@
-// WorkBuddy 账号落盘：auths/workbuddy-<uid>.json（0600 tmp+rename）+ state.json keys/auths 按 uid 去重追加。
-// token-auto 与 device-login 共用，保证两种入口写出完全一致。
+// WorkBuddy 账号落盘单一源：auths/workbuddy-<uid>.json（0600 tmp+rename）+ state.json keys/auths 按 uid 去重。
+// token-auto / device-login / 刷新（服务端 saveFn 与 CLI 定时任务）共用同一实现，安全细节只维护一份。
+// Note: 刷新落盘只走 applyTokenRefresh，别再各自内联一套 — 见 .agents/notes/implemented/architecture/2026-09-17-workbuddy-persist-single-seam.md
 import { writeFileSync, mkdirSync, existsSync, renameSync, unlinkSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { tmpdir } from "node:os";
+import { isTestEnv } from "../../state/store.js";
 
 export function resolveAuthDir() {
   if (process.env.WORKBUDDY_AUTH_DIR) return process.env.WORKBUDDY_AUTH_DIR;
   const sf = process.env.MSLXDFF_STATE_FILE || "";
-  if (sf.includes("mslxdff-test") || process.env.NODE_ENV === "test") return join(tmpdir(), "mslxdff-test-auths");
+  if (sf.includes("mslxdff-test") || isTestEnv()) return join(tmpdir(), "mslxdff-test-auths");
   if (sf && sf.includes("mslxdff-")) return join(dirname(sf), "auths");
   return join(process.cwd(), "auths");
 }
 
-export async function saveWorkbuddyAccount({ uid, enterpriseId = "", nickname = "", accessToken, refreshToken = "", expiresAt = 0, domain = "www.codebuddy.cn", file } = {}) {
-  if (!uid || !accessToken) throw new Error("saveWorkbuddyAccount: 缺少 uid/accessToken");
+function jwtExp(token) {
+  try {
+    const payload = String(token || "").split(".")[1];
+    if (!payload) return 0;
+    let b64 = payload.replace(/-/g, "+").replace(/_/g, "/");
+    const pad = b64.length % 4;
+    if (pad) b64 += "=".repeat(4 - pad);
+    return Number(JSON.parse(Buffer.from(b64, "base64").toString("utf8")).exp || 0);
+  } catch {
+    return 0;
+  }
+}
+
+function writeAccountFile({ uid, accessToken, refreshToken = "", expiresAt = 0, domain = "www.codebuddy.cn", enterpriseId = "", nickname = "" }) {
   const authDir = resolveAuthDir();
   mkdirSync(authDir, { recursive: true });
   const exp = expiresAt || Math.floor(Date.now() / 1000) + 5184000;
@@ -26,16 +40,81 @@ export async function saveWorkbuddyAccount({ uid, enterpriseId = "", nickname =
     renameSync(tmp, fp);
   } catch {
     writeFileSync(fp, JSON.stringify(doc, null, 2), { mode: 0o600 });
+    try { unlinkSync(tmp); } catch {} // 失败路径别把含凭据的 .tmp 留在盘上
   }
-  // 同步 state（对话轮换只读 state）
+  return fp;
+}
+
+// state.json 落盘单一实现：按 uid 配对更新（存在→更新该账号行，不存在→追加）；extraKeys 为没有 auth 行的裸 key，原样保留。
+async function persistAccounts(accounts, file, extraKeys = []) {
   const { loadProviderConfigs, saveProviderConfig } = await import("../../state.js");
   const cfg = (loadProviderConfigs(file ? { file } : {})?.workbuddy) || {};
   const keys = [...(Array.isArray(cfg.keys) ? cfg.keys : [])];
   const auths = [...(Array.isArray(cfg.auths) ? cfg.auths : [])];
-  const row = { uid, domain, enterpriseId, refreshToken };
-  const atIdx = auths.findIndex((a) => a?.uid === uid);
-  if (atIdx >= 0) { keys[atIdx] = accessToken; auths[atIdx] = row; }
-  else { keys.push(accessToken); auths.push(row); }
+  let updated = 0;
+  for (const acc of accounts) {
+    if (!acc?.uid || !acc?.accessToken) continue;
+    const row = { uid: acc.uid, domain: acc.domain || "www.codebuddy.cn", enterpriseId: acc.enterpriseId || "", refreshToken: acc.refreshToken || "" };
+    const atIdx = auths.findIndex((a) => a?.uid === acc.uid);
+    if (atIdx >= 0) { keys[atIdx] = acc.accessToken; auths[atIdx] = row; updated += 1; }
+    else { keys.push(acc.accessToken); auths.push(row); }
+  }
+  for (const k of extraKeys) {
+    if (k && !keys.includes(k)) keys.push(k);
+  }
   saveProviderConfig("workbuddy", { baseUrl: cfg.baseUrl || "https://copilot.tencent.com", keys, auths }, file ? { file } : {});
-  return { file: fp, accounts: keys.length, updated: atIdx >= 0 };
+  return { keys, auths, updated };
+}
+
+export async function saveWorkbuddyAccount({ uid, enterpriseId = "", nickname = "", accessToken, refreshToken = "", expiresAt = 0, domain = "www.codebuddy.cn", file } = {}) {
+  if (!uid || !accessToken) throw new Error("saveWorkbuddyAccount: 缺少 uid/accessToken");
+  const fp = writeAccountFile({ uid, accessToken, refreshToken, expiresAt, domain, enterpriseId, nickname });
+  const st = await persistAccounts([{ uid, accessToken, refreshToken, domain, enterpriseId }], file);
+  return { file: fp, accounts: st.keys.length, updated: st.updated > 0 };
+}
+
+// 由平行数组（keys[i] ↔ authList[i]，provider 构造时即如此）还原账号列表；没有 auth 行的裸 key 走 extraKeys 原样保留。
+function accountsFromArrays(keys, authList) {
+  const accounts = [];
+  const extraKeys = [];
+  const n = Math.max(keys.length, authList.length);
+  for (let i = 0; i < n; i++) {
+    const a = authList[i];
+    if (a && typeof a === "object" && a.uid) {
+      accounts.push({ uid: a.uid, accessToken: keys[i] || "", refreshToken: a.refreshToken || "", domain: a.domain, enterpriseId: a.enterpriseId });
+    } else if (keys[i]) {
+      extraKeys.push(keys[i]);
+    }
+  }
+  return { accounts, extraKeys };
+}
+
+// 刷新后的 token 落盘：keys 与 authList 是两条平行数组，按下标更新命中的槽位（旧 key 命中优先，
+// 否则按 uid 命中；都没有 → 追加），再把整表经 persistAccounts 单点落 state + auths 文件。
+// 服务端 saveFn 与 CLI/定时任务共用。
+export async function applyTokenRefresh({ uid, oldKey, newToken, refreshToken = "", domain = "www.codebuddy.cn", enterpriseId = "", auth = null, keys = [], authList = [], file } = {}) {
+  if (!uid || !newToken) return { updated: false, accounts: keys.length, file: null };
+  const keyIdx = keys.indexOf(oldKey);
+  const uidIdx = authList.findIndex((a) => a && String(a.uid) === String(uid));
+  // 平行数组约定：命中任一侧即用该下标（keys[i] 与 authList[i] 同属一个账号，不会覆盖他人）
+  const idx = keyIdx >= 0 ? keyIdx : uidIdx;
+  const matched = idx >= 0;
+  if (idx >= 0) keys[idx] = newToken;
+  else if (!keys.includes(newToken)) keys.push(newToken);
+  if (uidIdx >= 0) {
+    const prev = authList[uidIdx] && typeof authList[uidIdx] === "object" ? authList[uidIdx] : null;
+    authList[uidIdx] = {
+      ...(prev || auth || {}),
+      uid,
+      domain: prev?.domain || auth?.domain || domain,
+      enterpriseId: prev?.enterpriseId || auth?.enterpriseId || enterpriseId,
+      refreshToken,
+    };
+  } else {
+    authList.push({ ...(auth || {}), uid, domain: auth?.domain || domain, enterpriseId: auth?.enterpriseId || enterpriseId, refreshToken });
+  }
+  const fp = writeAccountFile({ uid, accessToken: newToken, refreshToken, expiresAt: jwtExp(newToken), domain, enterpriseId });
+  const { accounts, extraKeys } = accountsFromArrays(keys, authList);
+  const st = await persistAccounts(accounts, file, extraKeys);
+  return { updated: matched, accounts: st.keys.length, file: fp };
 }

package/src/providers/workbuddy/auth.js

@@ -1,6 +1,7 @@
 import { joinUrl } from "../base.js";
 import { compatFetch } from "../../compat.js";
 import { WORKBUDDY_DEFAULT_BASE_URL } from "../../state/schemas/provider.js";
+import { applyTokenRefresh } from "./account-store.js";
 
 export function decodeJwtExp(token) {
   try {
@@ -45,11 +46,7 @@ export function createAuthService({
   saveFn,
 } = {}) {
   const resolvedBase = baseUrl ? String(baseUrl).trim().replace(/\/+$/, "") : WORKBUDDY_DEFAULT_BASE_URL;
-  if (!fetchImpl) {
-    // 兼容层统一取（undici 优先，老 Node 兜底）
-    fetchImpl = compatFetch;
-  }
-  // lazy resolve UndiciFetch if not provided
+  // 兼容层统一取（undici 优先，老 Node 兜底）
   if (!fetchImpl) fetchImpl = compatFetch;
 
   const inflightRefresh = new Map();
@@ -84,50 +81,29 @@ export function createAuthService({
         if (j.code === 0 && j.data?.accessToken) {
           const newAt = j.data.accessToken;
           const newRt = j.data.refreshToken || rt;
-          // attempt to persist if store provided
+          // attempt to persist if store provided（落盘细节单一源：account-store.applyTokenRefresh）
           try {
             if (saveFn) {
               await saveFn({ newAt, newRt, uid, oldKey: key, auth });
             } else if (store && typeof store.save === "function") {
               await store.save({ newAt, newRt, uid, oldKey: key, auth });
             } else if (store && Array.isArray(store.keys) && Array.isArray(store.authList)) {
-              // direct mutation fallback (legacy shape)
-              const idx = store.keys.indexOf(key);
-              if (idx >= 0) {
-                store.keys[idx] = newAt;
-                store.authList[idx] = { ...auth, refreshToken: newRt };
-                try {
-                  const { saveProviderConfig } = await import("../../state.js");
-                  saveProviderConfig("workbuddy", { baseUrl: resolvedBase, keys: [...store.keys], auths: [...store.authList] }, file ? { file } : {});
-                } catch {}
-                try {
-                  const { writeFileSync, mkdirSync, existsSync } = await import("node:fs");
-                  const { join, dirname } = await import("node:path");
-                  const { tmpdir } = await import("node:os");
-                  const isTest = process.env.NODE_ENV === "test" || (process.env.MSLXDFF_STATE_FILE && String(process.env.MSLXDFF_STATE_FILE).includes("mslxdff-test"));
-                  const authDir = process.env.WORKBUDDY_AUTH_DIR || (isTest ? join(tmpdir(), "mslxdff-test-auths") : (file && String(file).includes("mslxdff-") ? join(dirname(String(file)), "auths") : join(process.cwd(), "auths")));
-                  mkdirSync(authDir, { recursive: true });
-                  const expAt = (() => { try { return JSON.parse(Buffer.from(newAt.split(".")[1], "base64").toString()).exp; } catch { return Math.floor(Date.now() / 1000) + 5184000; } })();
-                  const doc = { account: { uid, enterpriseId: auth.enterpriseId || "", nickname: "" }, auth: { accessToken: newAt, refreshToken: newRt, expiresAt: expAt, domain: auth.domain || "www.codebuddy.cn" } };
-                  const fp = join(authDir, `workbuddy-${uid}.json`);
-                  const tmp = fp + ".tmp";
-                  writeFileSync(tmp, JSON.stringify(doc, null, 2), { mode: 0o600 });
-                  try {
-                    if (existsSync(fp)) {
-                      const { unlinkSync, renameSync } = await import("node:fs");
-                      unlinkSync(fp);
-                      renameSync(tmp, fp);
-                    } else {
-                      const { renameSync } = await import("node:fs");
-                      renameSync(tmp, fp);
-                    }
-                  } catch {
-                    writeFileSync(fp, JSON.stringify(doc, null, 2), { mode: 0o600 });
-                  }
-                } catch {}
-              }
+              await applyTokenRefresh({
+                uid,
+                oldKey: key,
+                newToken: newAt,
+                refreshToken: newRt,
+                domain: auth.domain || "www.codebuddy.cn",
+                enterpriseId: auth.enterpriseId || "",
+                auth,
+                keys: store.keys,
+                authList: store.authList,
+                file: file || undefined,
+              });
             }
-          } catch {}
+          } catch (err) {
+            console.error(`[workbuddy] token 落盘失败（刷新已成功，重启将丢失）: ${String(err?.message || err).slice(0, 200)}`);
+          }
           return newAt;
         }
       } catch {}
@@ -155,18 +131,3 @@ export function createAuthService({
 
   return { refreshTokenFor, maybeProactiveRefresh, decodeJwtExp, isAuthError, isInsufficientStatus, _inflight: inflightRefresh };
 }
-
-function awaitImportUndici() {
-  try {
-    // dynamic to avoid top-level await
-    let UndiciFetch = null;
-    try {
-      // eslint-disable-next-line no-undef
-      const mod = globalThis.__mslxdff_undici || null;
-      if (mod) return mod;
-    } catch {}
-    return { UndiciFetch: null };
-  } catch {
-    return { UndiciFetch: null };
-  }
-}

package/src/providers/workbuddy/index.js

@@ -1,11 +1,11 @@
 import { createKeyRing } from "../keyring.js";
-import { loadProviderKeys, loadProviderAuths, loadProviderBaseUrl, loadProviderShareKeys, saveProviderConfig, WORKBUDDY_DEFAULT_BASE_URL, loadProviderModelsPath, loadProviderChatPath } from "../../state.js";
-import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
+import { loadProviderKeys, loadProviderAuths, loadProviderBaseUrl, loadProviderShareKeys, WORKBUDDY_DEFAULT_BASE_URL, loadProviderModelsPath, loadProviderChatPath } from "../../state.js";
+import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { compatFetch } from "../../compat.js";
-import { join, dirname } from "node:path";
-import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { envInt, joinUrl, getUndici, createAgent } from "../base.js";
 import { createAuthService, isAuthError, isInsufficientStatus, decodeJwtExp } from "./auth.js";
+import { applyTokenRefresh, resolveAuthDir } from "./account-store.js";
 import { createChatService } from "./chat.js";
 import { createModelsService } from "./models.js";
 import { createBalanceCache, getCachedBalance as defaultGetCached, setCachedBalance as defaultSetCached } from "./balance.js";
@@ -13,15 +13,6 @@ import { defaultLogger } from "./rotation-log.js";
 
 const { UndiciAgent, UndiciFetch } = getUndici();
 
-function isTestEnv() {
-  if (process.env.NODE_ENV === "test") return true;
-  if (process.env.MSLXDFF_STATE_FILE && String(process.env.MSLXDFF_STATE_FILE).includes("mslxdff-test")) return true;
-  if (process.argv.some((a) => String(a).includes("--test") || String(a).endsWith(".test.js"))) return true;
-  if (Array.isArray(process.execArgv) && process.execArgv.some((a) => String(a).includes("--test"))) return true;
-  if (process.env.NODE_TEST_CONTEXT) return true;
-  return false;
-}
-
 function resolveBaseUrl(baseUrl) {
   if (baseUrl) return String(baseUrl).trim().replace(/\/+$/, "");
   const env = loadProviderBaseUrl("workbuddy");
@@ -71,7 +62,7 @@ export function createWorkbuddyProvider({
 
   if (!authList.length && !keys.length) {
     try {
-      const authDir = process.env.WORKBUDDY_AUTH_DIR || (isTestEnv() ? join(tmpdir(), "mslxdff-test-auths") : (file && String(file).includes("mslxdff-") ? join(dirname(String(file)), "auths") : join(process.cwd(), "auths")));
+      const authDir = resolveAuthDir();
       if (existsSync(authDir)) {
         const files = readdirSync(authDir).filter((f) => f.startsWith("workbuddy-") && f.endsWith(".json"));
         for (const f of files) {
@@ -112,48 +103,28 @@ export function createWorkbuddyProvider({
 
   const logger = loggerOpt || defaultLogger;
 
-  // authService with saveFn that mutates outer keys/authList/ring and persists
   const authService = createAuthService({
     baseUrl: resolvedBase,
     fetchImpl,
     clock,
     dispatcher,
     file,
+    // 落盘细节单一源：account-store.applyTokenRefresh（数组就地更新 + state + auths 文件）
     saveFn: async ({ newAt, newRt, uid, oldKey, auth }) => {
-      const idx = keys.indexOf(oldKey);
-      if (idx >= 0) {
-        keys[idx] = newAt;
-        authList[idx] = { ...(authList[idx] || auth), refreshToken: newRt };
-        try { ring.replace(oldKey, newAt); } catch {}
-        try { saveProviderConfig(id, { baseUrl: resolvedBase, keys: [...keys], auths: [...authList] }, file ? { file } : {}); } catch {}
-        try {
-          const authDir = process.env.WORKBUDDY_AUTH_DIR || (isTestEnv() ? join(tmpdir(), "mslxdff-test-auths") : (file && String(file).includes("mslxdff-") ? join(dirname(String(file)), "auths") : join(process.cwd(), "auths")));
-          mkdirSync(authDir, { recursive: true });
-          const expAt = (() => { try { return JSON.parse(Buffer.from(newAt.split(".")[1], "base64").toString()).exp; } catch { return Math.floor(Date.now() / 1000) + 5184000; } })();
-          const doc = { account: { uid, enterpriseId: auth.enterpriseId || "", nickname: "" }, auth: { accessToken: newAt, refreshToken: newRt, expiresAt: expAt, domain: auth.domain || "www.codebuddy.cn" } };
-          const fp = join(authDir, `workbuddy-${uid}.json`);
-          const tmp = fp + ".tmp";
-          writeFileSync(tmp, JSON.stringify(doc, null, 2), { mode: 0o600 });
-          try {
-            if (existsSync(fp)) {
-              const { unlinkSync, renameSync } = await import("node:fs");
-              unlinkSync(fp);
-              renameSync(tmp, fp);
-            } else {
-              const { renameSync } = await import("node:fs");
-              renameSync(tmp, fp);
-            }
-          } catch {
-            writeFileSync(fp, JSON.stringify(doc, null, 2), { mode: 0o600 });
-          }
-        } catch {}
-      } else {
-        if (!keys.includes(newAt)) {
-          keys.push(newAt);
-          authList.push({ ...(auth || {}), uid, refreshToken: newRt });
-          try { ring.replace(oldKey, newAt); } catch {}
-        }
-      }
+      const r = await applyTokenRefresh({
+        uid,
+        oldKey,
+        newToken: newAt,
+        refreshToken: newRt,
+        domain: auth?.domain || "www.codebuddy.cn",
+        enterpriseId: auth?.enterpriseId || "",
+        auth,
+        keys,
+        authList,
+        file,
+      });
+      try { ring.replace(oldKey, newAt); } catch {}
+      return r;
     },
   });
 

package/src/routes/chat/relay-pipeline.js

@@ -1,7 +1,7 @@
 import { runHook } from "../../plugins.js";
 import { recordModelStats } from "../../state.js";
 import { normalizeFullId } from "../../providers/model-id.js";
-import { computeMetrics, extractUsageFromJson, extractUsageFromSseText } from "../../metrics.js";
+import { computeMetrics } from "../../metrics.js";
 
 // 唯一/最后候选没有 failover 去向：首块闸门退化为纯"防连接泄漏"，放宽避免误杀慢模型
 // （参考 opencode：zen 通道不设超时；openai responses 硬编码 300s headerTimeout）
@@ -109,11 +109,12 @@ export function createRelayPipeline({
       totalMs: out.totalMs,
       aborted: out.aborted,
       interrupted: out.interrupted ?? false,
+      timedOut: out.timedOut ?? false,
       detail: out.detail ?? null,
     });
 
-    // 5a. 首块超时未写字节 → 回退
-    if (streamTimeoutMs > 0 && out.status === streamTimeoutMs) {
+    // 5a. 首块超时未写字节 → 回退（显式 timedOut 字段，status 只是 HTTP 语义展示）
+    if (out.timedOut === true) {
       if (auto) try { await auto.recordError(actual, { status: 502, slow: true, note: `stream timeout ${streamTimeoutMs}ms` }); } catch {}
       try { _logError(actual, 502, `stream timeout ${streamTimeoutMs}ms`); } catch {}
       _evt("upstream-error", { reqId, model: actual, status: 502, message: "stream timeout", timing: null });

package/src/routes/stream.js

@@ -1,6 +1,7 @@
 import { performance } from "node:perf_hooks";
 import { applyFallbackHeaders, enrichNonStreamJson, enrichSseChunkText } from "./fallback.js";
 import { json } from "./helpers.js";
+import { extractUsageFromJson, extractUsageFromSseText } from "../metrics.js";
 
 // SDK 通道（TextEncoder）产出 Uint8Array，legacy 通道为 Buffer；
 // 统一转文本，避免 [DONE]/finish_reason/usage/chars 统计在 SDK 路径下静默失效。
@@ -163,8 +164,8 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
             if (txt.includes("[DONE]")) detail.sawDone = true;
             const m = txt.match(/"finish_reason"\s*:\s*"([^"]+)"/);
             if (m) detail.sawFinishReason = m[1];
-            // 尝试提取 usage（流式末帧）
-            if (txt.includes("\"usage\"") || txt.includes("prompt_tokens")) {
+            // 尝试提取 usage（流式末帧）：口径收口到 metrics.js，与未流式分支共用
+            if (txt.includes("\"usage\"") || txt.includes("\"prompt_tokens\"")) {
               try {
                 const lines = txt.split("\n");
                 for (const line of lines) {
@@ -172,28 +173,22 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
                   if (!t.startsWith("data:")) continue;
                   const d = t.slice(5).trim();
                   if (d === "[DONE]" || !d) continue;
-                  const j = JSON.parse(d);
-                  if (j && j.usage && typeof j.usage === "object") {
-                    const u = j.usage;
-                    const pt = Number(u.prompt_tokens ?? u.promptTokens ?? u.input_tokens);
-                    const ct = Number(u.completion_tokens ?? u.completionTokens ?? u.output_tokens);
-                    const tt = Number(u.total_tokens ?? u.totalTokens);
-                    const cur = {};
-                    if (Number.isFinite(pt)) cur.prompt_tokens = pt;
-                    if (Number.isFinite(ct)) cur.completion_tokens = ct;
-                    if (Number.isFinite(tt)) cur.total_tokens = tt;
-                    if (Object.keys(cur).length) detail.usage = cur;
+                  // 行级隔离：单行坏 JSON 不拖累同 chunk 其余行
+                  try {
+                    const j = JSON.parse(d);
+                    if (!j || typeof j !== "object") continue;
+                    const u = extractUsageFromJson(j);
+                    if (u) detail.usage = u;
                     // 兜底 chars：从 choices 文本长度累加
                     const delta = j.choices?.[0]?.delta?.content || j.choices?.[0]?.message?.content || "";
                     if (delta) detail.chars += String(delta).length;
-                  }
+                  } catch { /* 单行坏帧忽略 */ }
                 }
               } catch {}
             } else {
               // 非 usage 的普通 delta 也累 chars
               try {
-                const txt2 = chunkText(chunk);
-                const ms = txt2.match(/"content"\s*:\s*"([^"]*)"/g);
+                const ms = txt.match(/"content"\s*:\s*"([^"]*)"/g);
                 if (ms) for (const mm of ms) {
                   const c = JSON.parse(`{${mm}}`);
                   if (c.content) detail.chars += String(c.content).length;
@@ -250,14 +245,15 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
       }
       if (timedOut && !wroteAny) {
         res.removeListener("close", onClose);
-        return { status: streamTimeoutMs, ttfMs: null, totalMs: Math.round(performance.now() - t0), aborted: true, interrupted: false, detail };
+        // Note: 超时是显式字段（timedOut），别再用 status 数值当信号 — 见 .agents/notes/implemented/architecture/2026-09-17-relay-timedout-explicit-and-metrics-seam.md
+        return { status: 504, timedOut: true, ttfMs: null, totalMs: Math.round(performance.now() - t0), aborted: true, interrupted: false, detail };
       }
       if ((stalled || tooLong) && wroteAny) {
         interrupted = true;
         detail.exitReason = detail.exitReason || (stalled ? "stall" : "max");
         res.removeListener("close", onClose);
         try { res.end(); } catch { /* ignore */ }
-        return { status: 200, ttfMs: ttf, totalMs: Math.round(performance.now() - t0), aborted: false, interrupted, detail };
+        return { status: 200, timedOut: false, ttfMs: ttf, totalMs: Math.round(performance.now() - t0), aborted: false, interrupted, detail };
       }
     } else {
       detail.exitReason = "empty-body";
@@ -267,7 +263,7 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
     finishedNormally = true;
     res.removeListener("close", onClose);
     try { res.end(); } catch { /* ignore */ }
-    return { status: 200, ttfMs: ttf, totalMs, aborted: false, interrupted: false, detail };
+    return { status: 200, timedOut: false, ttfMs: ttf, totalMs, aborted: false, interrupted: false, detail };
   }
 
   finishedNormally = true;
@@ -275,32 +271,24 @@ export async function relay(res, upRes, body, { onFirstChunk, onDownstreamAbort,
   const text = await upRes.text();
   detail.receivedBytes = Buffer.byteLength(text);
   detail.exitReason = "normal-non-stream";
-  // 非流式 usage 与 chars 提取
+  // 非流式 usage 与 chars 提取（口径与流式分支共用 metrics.js）
   try {
     const parsed = JSON.parse(text);
-    const u = parsed.usage;
-    if (u && typeof u === "object") {
-      const pt = Number(u.prompt_tokens ?? u.promptTokens ?? u.input_tokens);
-      const ct = Number(u.completion_tokens ?? u.completionTokens ?? u.output_tokens);
-      const tt = Number(u.total_tokens ?? u.totalTokens);
-      const cur = {};
-      if (Number.isFinite(pt)) cur.prompt_tokens = pt;
-      if (Number.isFinite(ct)) cur.completion_tokens = ct;
-      if (Number.isFinite(tt)) cur.total_tokens = tt;
-      if (Object.keys(cur).length) detail.usage = cur;
-      if (parsed.choices?.[0]?.message?.content) detail.chars = String(parsed.choices[0].message.content).length;
-      else if (parsed.choices?.[0]?.text) detail.chars = String(parsed.choices[0].text).length;
-    }
+    const u = extractUsageFromJson(parsed);
+    if (u) detail.usage = u;
+    if (parsed.choices?.[0]?.message?.content) detail.chars = String(parsed.choices[0].message.content).length;
+    else if (parsed.choices?.[0]?.text) detail.chars = String(parsed.choices[0].text).length;
     const enriched = enrichNonStreamJson(parsed, fallback);
     json(res, upRes.status, enriched);
   } catch {
     res.statusCode = upRes.status;
     res.setHeader("Content-Type", contentType || "text/plain");
     res.end(text);
-    // 纯文本时按长度估 chars
+    // 纯文本时按长度估 chars；若文本其实是 SSE（client 未要流但上游给流）仍尝试提 usage
     try { detail.chars = text.length; } catch {}
+    try { const u = extractUsageFromSseText(text); if (u) detail.usage = u; } catch {}
   }
   // 非流式 ttf 视为 total（一次性返回）
   const totalMs = Math.round(performance.now() - t0);
-  return { status: upRes.status, ttfMs: totalMs, totalMs, aborted: false, interrupted: false, detail };
+  return { status: upRes.status, timedOut: false, ttfMs: totalMs, totalMs, aborted: false, interrupted: false, detail };
 }

package/src/state/store.js

@@ -8,7 +8,7 @@ import { mergeState, COLD_WINS } from "./merge.js";
 
 export const DEFAULT_PORT = 8989;
 
-function isTestEnv() {
+export function isTestEnv() {
   if (process.env.NODE_ENV === "test") return true;
   if (process.env.MSLXDFF_STATE_FILE && String(process.env.MSLXDFF_STATE_FILE).includes("mslxdff-test")) return true;
   if (process.argv.some((a) => String(a).includes("--test") || String(a).endsWith(".test.js"))) return true;

package/src/upstream.js

@@ -7,11 +7,9 @@ import { isFreeModel } from "./models.js";
 import { fmtShanghaiYMDHMS } from "./time.js";
 import { createTransport } from "./transport/index.js";
 import { isResponsesModel, chatToResponsesBody, toChatResponse, reshapeResponsesSse } from "./upstream-responses.js";
-import { uuid } from "./compat.js";
+import { digestIdTail, genId, opencodeClientIdentity, opencodeUa } from "./opencode-identity.js";
 
-function genId(prefix) {
-  return `${prefix}${uuid().replace(/-/g, "")}`;
-}
+export { opencodeClientIdentity, opencodeUa };
 // 上游按 session 做粘性路由（实测：固定 session 两次请求均 ~1.2s；每次随机时可能撞冷机器 26s+）。
 // 客户端（opencode AI SDK 路径）不带会话标识 → 用对话首两条消息（system + 首条 user）哈希做稳定会话：
 // 同一会话多轮里这两条不变 ⇒ 路由亲和稳定；不同会话天然分散。
@@ -25,7 +23,7 @@ function sessionFromMessages(messages) {
     };
     const seed = `${pick("system")}|${pick("user")}`.slice(0, 4000);
     if (seed === "|") return null;
-    return `ses_${crypto.createHash("sha1").update(seed).digest("hex").slice(0, 32)}`;
+    return `ses_${digestIdTail(crypto.createHash("sha1").update(seed).digest())}`;
   } catch {
     return null;
   }
@@ -56,7 +54,7 @@ export function createOpencodeHeaderBuilder({ authToken = "public", env = proces
         "Content-Type": "application/json",
         Authorization: "",
         "x-opencode-client": "desktop",
-        "User-Agent": "opencode",
+        "User-Agent": opencodeUa(),
         "HTTP-Referer": "https://hermes-agent.nousresearch.com",
         "X-Title": "Hermes Agent",
       }
@@ -73,7 +71,7 @@ export function createOpencodeHeaderBuilder({ authToken = "public", env = proces
     const base = {
       ...baseHeaders,
       Accept: isStream ? "text/event-stream" : "*/*",
-      "User-Agent": "opencode",
+      "User-Agent": opencodeUa(),
       "x-opencode-session": session,
       "x-opencode-request": genId("msg_"),
       "x-opencode-project": "global",