@lyogvce/dsh-codex-subscription 0.2.3 → 0.2.4

package/README.md

@@ -11,8 +11,10 @@
 1. **与本机 Codex CLI / Desktop 100% 共享登录态**
    - 直接读取 `$CODEX_HOME/auth.json`（默认 `~/.codex/auth.json`）。
    - 每次请求前检查 `access_token` 的 JWT `exp`：距离过期不足 5 分钟时自动通过单飞锁（Single-flight）向 `https://auth.openai.com/oauth/token` 刷新，并通过 `realpathSync` + 临时文件 `rename` 原子写回 `auth.json`，保证与 Codex CLI 永不互踢下线。
-2. **零网络轮询的本地模型目录发现**
-   - 直接读取 `~/.codex/models_cache.json`（按文件 `mtime` 与大小自动感知更新），提取 `visibility === "list"` 的模型及其 `context_window`、`supported_reasoning_levels`（自动将 `ultra` 映射为 DSH 的 `max` 档位）与 `default_verbosity`。
+2. **零网络轮询的本地模型目录发现、防降级保护与可观测性日志**
+   - 直接读取 `~/.codex/models_cache.json`（每次按文件 `mtime` 与大小做微秒级 `stat` 校验，仅在文件变化时重读解析），提取 `visibility === "list"` 的模型及其 `context_window`、`supported_reasoning_levels`（自动将 `ultra` 映射为 DSH 的 `max` 档位）与 `default_verbosity`。
+   - **防旧版客户端降级污染**：自动将高版本 `models_cache.json` 备份至 `~/.codex/.dsh-models-cache-backup.json`；当外部旧版进程（如 `dsh-subagent-codex` 内置的 `0.153.4`）将 `models_cache.json` 降级覆写为不含新模型的旧缓存时，自动拦截降级并保留高版本模型目录。
+   - **可观测性日志**：自动在 `~/.codex/dsh-codex-subscription.log`（带 512KB 自动滚动截断）记录目录加载（`catalog.load` / `catalog.snapshot`）、降级拦截（`catalog.downgrade_rejected`）、备份恢复（`catalog.backup_restored`）与凭证续期（`auth.refreshed`）事件。
 3. **支持按配置屏蔽模型（`disabledModels`）与自定义上下文窗口（`contextWindows`）**
    - 在插件配置中通过 `disabledModels` 屏蔽指定模型 `slug`，保持模型选择器干净清爽。
    - 通过 `contextWindows` 按模型 `slug` 自定义向 DSH 会话与自动压缩器暴露的预算窗口（例如设为 `400000`）；未配置时默认使用模型物理上限 `max_context_window`（`872000`）。同时底层 `PiCodexModel.contextWindow` 始终保持物理上限 `872000`，彻底防止 `dsh-llm-pi-ai` 在预算窗口与物理上限之间误判 `CONTEXT_WINDOW_EXCEEDED`。

package/lib/client.js

@@ -448,7 +448,6 @@ window.__ModuleLoader__.load({
 			isCodexProvider,
 			didTurnFinish,
 			windowLevelOf,
-			formatWindowShortLabel,
 			formatWindowTitle,
 			formatQuotaSummary,
 			formatResetCountdown,

package/lib/index.d.ts

@@ -19,6 +19,7 @@ interface JwtClaims {
 interface AuthManagerOptions {
   getCodexHome: () => string;
   getClientVersion?: (() => string) | undefined;
+  onLog?: ((level: 'INFO' | 'WARN' | 'ERROR', event: string, detail: Record<string, unknown>) => void) | undefined;
   fetchImpl?: typeof fetch | undefined;
   now?: (() => number) | undefined;
 }
@@ -54,9 +55,11 @@ interface RawCodexModelEntry {
   default_verbosity?: string;
 }
 interface RawModelsCache {
+  fetched_at?: string;
   client_version?: string;
   models?: RawCodexModelEntry[];
 }
+declare function compareClientVersions(a: string | undefined, b: string | undefined): number;
 interface CodexModelMetadata {
   readonly contextWindow: number;
   readonly supportVerbosity: boolean;
@@ -119,8 +122,14 @@ interface LlmServiceLike {
   };
   emitAdaptersUpdated?: () => void;
 }
+interface LoggerLike {
+  info?: (message: string) => void;
+  warn?: (message: string) => void;
+  error?: (message: string) => void;
+}
 interface PluginContextLike {
   llm: LlmServiceLike;
+  logger?: LoggerLike | undefined;
   get?: (name: string) => unknown;
   on?: (event: string, listener: () => void) => () => void;
   effect?: (factory: () => void | (() => void), label?: string) => () => void;
@@ -130,6 +139,8 @@ interface PluginContextLike {
 //#region src/index.d.ts
 export declare const name = "codex-subscription";
 export declare const inject: string[];
+export declare const LOG_FILE_NAME = "dsh-codex-subscription.log";
+export declare const BACKUP_CACHE_FILE_NAME = ".dsh-models-cache-backup.json";
 export declare const Config: any;
 export declare function apply(ctx: PluginContextLike, config?: Record<string, unknown>): void;
 export declare const __test: Readonly<{
@@ -146,6 +157,7 @@ export declare const __test: Readonly<{
   safeErrorMessage: typeof safeErrorMessage;
   createAuthManager: typeof createAuthManager;
   buildThinkingLevelMap: typeof buildThinkingLevelMap;
+  compareClientVersions: typeof compareClientVersions;
   parseModelsCache: typeof parseModelsCache;
   sanitizeCodexPayload: typeof sanitizeCodexPayload;
   buildCodexHeaders: typeof buildCodexHeaders;

package/lib/index.js

@@ -1,4 +1,4 @@
-import { chmodSync, readFileSync, realpathSync, statSync } from "node:fs";
+import { appendFileSync, chmodSync, readFileSync, realpathSync, statSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { LlmError, resolveImageAttachmentAccess, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
@@ -29,6 +29,18 @@ const DEFAULT_DISABLED_MODELS = Object.freeze([
 	"gpt-5.6-terra",
 	"gpt-5.6-luna"
 ]);
+function compareClientVersions(a, b) {
+	const parseParts = (ver) => typeof ver === "string" && ver.trim() !== "" ? ver.trim().split(/[^0-9]+/u).filter(Boolean).map((n) => Number.parseInt(n, 10)) : [];
+	const pa = parseParts(a);
+	const pb = parseParts(b);
+	const len = Math.max(pa.length, pb.length);
+	for (let i = 0; i < len; i += 1) {
+		const va = pa[i] ?? 0;
+		const vb = pb[i] ?? 0;
+		if (va !== vb) return va > vb ? 1 : -1;
+	}
+	return 0;
+}
 function buildThinkingLevelMap(supportedLevels) {
 	const efforts = new Set((Array.isArray(supportedLevels) ? supportedLevels : []).map((item) => {
 		if (typeof item === "string") return item;
@@ -455,8 +467,17 @@ function createAuthManager(options) {
 		};
 		try {
 			await writeJsonAtomic(authPath, nextAuth);
+			options.onLog?.("INFO", "auth.refreshed", {
+				authPath,
+				accountId: extractAccountId(nextAuth, fresh.access_token) ?? null
+			});
 		} catch (error) {
-			console.error(`[dsh-codex-subscription] 写回刷新后的 Codex auth.json 失败 (${authPath}): ${safeErrorMessage(error)}`);
+			const errMsg = safeErrorMessage(error);
+			options.onLog?.("WARN", "auth.writeback_failed", {
+				authPath,
+				error: errMsg
+			});
+			console.error(`[dsh-codex-subscription] 写回刷新后的 Codex auth.json 失败 (${authPath}): ${errMsg}`);
 		}
 		return {
 			accessToken: fresh.access_token,
@@ -492,10 +513,55 @@ function createAuthManager(options) {
 //#region src/index.ts
 const name = "codex-subscription";
 const inject = ["llm"];
+const LOG_FILE_NAME = "dsh-codex-subscription.log";
+const BACKUP_CACHE_FILE_NAME = ".dsh-models-cache-backup.json";
 const STREAM_IDLE_TIMEOUT_MS = 3e5;
 const MAX_REQUEST_IMAGE_BYTES = 20971520;
 const REQUEST_IMAGE_PIXEL_BUDGET = 4194304;
 const REQUEST_IMAGE_MAX_BYTES = 1048576;
+const MAX_LOG_FILE_BYTES = 524288;
+function appendPluginLog(codexHome, ctx, level, event, detail) {
+	const line = `[${new Date().toISOString()}] [${level}] ${event} ${JSON.stringify(detail)}\n`;
+	if (level === "ERROR") {
+		if (typeof ctx.logger?.error === "function") ctx.logger.error(`[dsh-codex-subscription] ${event}: ${JSON.stringify(detail)}`);
+		else console.error(`[dsh-codex-subscription] ${event}: ${JSON.stringify(detail)}`);
+	} else if (level === "WARN") {
+		if (typeof ctx.logger?.warn === "function") ctx.logger.warn(`[dsh-codex-subscription] ${event}: ${JSON.stringify(detail)}`);
+	}
+	try {
+		const logPath = join(codexHome, LOG_FILE_NAME);
+		try {
+			if (statSync(logPath).size > MAX_LOG_FILE_BYTES) {
+				const tail = readFileSync(logPath, "utf8").slice(-Math.floor(MAX_LOG_FILE_BYTES / 2));
+				writeFileSync(logPath, tail, {
+					encoding: "utf8",
+					mode: 384
+				});
+			}
+		} catch {}
+		appendFileSync(logPath, line, {
+			encoding: "utf8",
+			mode: 384
+		});
+	} catch {}
+}
+function readBackupCache(codexHome) {
+	try {
+		return JSON.parse(readFileSync(join(codexHome, BACKUP_CACHE_FILE_NAME), "utf8"));
+	} catch {
+		return;
+	}
+}
+function writeBackupCache(codexHome, raw) {
+	try {
+		const existing = readBackupCache(codexHome);
+		if (existing && compareClientVersions(raw.client_version, existing.client_version) < 0) return;
+		writeFileSync(join(codexHome, BACKUP_CACHE_FILE_NAME), `${JSON.stringify(raw, null, 2)}\n`, {
+			encoding: "utf8",
+			mode: 384
+		});
+	} catch {}
+}
 const Config = z.object({
 	disabledModels: z.array(z.string()).default([...DEFAULT_DISABLED_MODELS]).description("在模型选择器中屏蔽的模型 slug 列表").volatile(),
 	contextWindows: z.dict(z.number()).default({}).description("按模型 slug 覆盖上下文窗口大小（tokens），未配置时默认使用 872000").volatile()
@@ -538,7 +604,8 @@ function apply(ctx, config = {}) {
 	const getContextWindows = () => readVolatile(config.contextWindows, {});
 	const authManager = createAuthManager({
 		getCodexHome,
-		getClientVersion: () => ensureSnapshot().catalog.clientVersion
+		getClientVersion: () => ensureSnapshot().catalog.clientVersion,
+		onLog: (level, event, detail) => appendPluginLog(getCodexHome(), ctx, level, event, detail)
 	});
 	let fileSignature;
 	let cachedRaw;
@@ -599,21 +666,64 @@ function apply(ctx, config = {}) {
 		}
 	});
 	function ensureSnapshot() {
-		const cachePath = join(getCodexHome(), "models_cache.json");
+		const codexHome = getCodexHome();
+		const cachePath = join(codexHome, "models_cache.json");
 		const disabled = getDisabledModels();
 		const contextWindows = getContextWindows();
 		try {
 			const stat = statSync(cachePath);
 			const nextFileSig = `${cachePath}:${stat.mtimeMs}:${stat.size}`;
 			if (nextFileSig !== fileSignature) {
-				cachedRaw = JSON.parse(readFileSync(cachePath, "utf8"));
+				const incomingRaw = JSON.parse(readFileSync(cachePath, "utf8"));
 				fileSignature = nextFileSig;
 				warnedMissingFile = false;
+				if (cachedRaw !== void 0 && compareClientVersions(incomingRaw.client_version, cachedRaw.client_version) < 0) appendPluginLog(codexHome, ctx, "WARN", "catalog.downgrade_rejected", {
+					cachePath,
+					keptVersion: cachedRaw.client_version ?? "0.163.0",
+					rejectedVersion: incomingRaw.client_version ?? "unknown",
+					incomingFetchedAt: incomingRaw.fetched_at ?? null
+				});
+				else {
+					const backupRaw = readBackupCache(codexHome);
+					if (backupRaw !== void 0 && compareClientVersions(backupRaw.client_version, incomingRaw.client_version) > 0) {
+						cachedRaw = backupRaw;
+						appendPluginLog(codexHome, ctx, "WARN", "catalog.backup_restored", {
+							cachePath,
+							diskVersion: incomingRaw.client_version ?? "unknown",
+							restoredVersion: backupRaw.client_version ?? "0.163.0",
+							restoredFetchedAt: backupRaw.fetched_at ?? null
+						});
+					} else {
+						cachedRaw = incomingRaw;
+						writeBackupCache(codexHome, incomingRaw);
+						appendPluginLog(codexHome, ctx, "INFO", "catalog.load", {
+							cachePath,
+							clientVersion: incomingRaw.client_version ?? "0.163.0",
+							fetchedAt: incomingRaw.fetched_at ?? null,
+							rawModelCount: Array.isArray(incomingRaw.models) ? incomingRaw.models.length : 0
+						});
+					}
+				}
 			}
 		} catch (error) {
+			if (cachedRaw === void 0) {
+				const backupRaw = readBackupCache(codexHome);
+				if (backupRaw !== void 0) {
+					cachedRaw = backupRaw;
+					appendPluginLog(codexHome, ctx, "WARN", "catalog.backup_restored", {
+						cachePath,
+						reason: safeErrorMessage(error),
+						restoredVersion: backupRaw.client_version ?? "0.163.0"
+					});
+				}
+			}
 			if (!warnedMissingFile) {
 				warnedMissingFile = true;
-				console.error(`[dsh-codex-subscription] 读取 Codex models_cache.json 失败 (${cachePath}): ${safeErrorMessage(error)}`);
+				appendPluginLog(codexHome, ctx, cachedRaw === void 0 ? "ERROR" : "WARN", "catalog.read_error", {
+					cachePath,
+					hasFallbackSnapshot: cachedRaw !== void 0,
+					error: safeErrorMessage(error)
+				});
 			}
 		}
 		const nextSnapshotSig = JSON.stringify([
@@ -627,6 +737,12 @@ function apply(ctx, config = {}) {
 				models: [],
 				metadataById: new Map()
 			};
+			appendPluginLog(codexHome, ctx, currentCatalog.models.length === 0 ? "WARN" : "INFO", "catalog.snapshot", {
+				clientVersion: currentCatalog.clientVersion,
+				models: currentCatalog.models.map((m) => m.id),
+				disabledModels: disabled,
+				contextWindows
+			});
 			currentProfilesMap = new Map([[PROVIDER, Object.freeze({
 				provider: PROVIDER,
 				displayName: DISPLAY_NAME,
@@ -715,6 +831,7 @@ const __test = Object.freeze({
 	safeErrorMessage,
 	createAuthManager,
 	buildThinkingLevelMap,
+	compareClientVersions,
 	parseModelsCache,
 	sanitizeCodexPayload,
 	buildCodexHeaders,
@@ -724,4 +841,4 @@ const __test = Object.freeze({
 	createUsageFetcher
 });
 //#endregion
-export { Config, __test, apply, inject, name };
+export { BACKUP_CACHE_FILE_NAME, Config, LOG_FILE_NAME, __test, apply, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lyogvce/dsh-codex-subscription",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "复用本机 ~/.codex 订阅凭证与 models_cache.json 模型缓存，在 DSH 中通过 SSE 直连调用 Codex 模型。",
   "type": "module",
   "main": "./lib/index.js",