@lyogvce/dsh-codex-subscription 0.2.5 → 0.2.6

package/README.md

@@ -13,8 +13,8 @@
    - 每次请求前检查 `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` 与大小做微秒级 `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`）事件。
+   - **防旧版客户端降级污染**：自动将高版本 `models_cache.json` 备份至 `~/.codex/cache/dsh-codex-subscription/models-cache-backup.json`；当外部旧版进程（如 `dsh-subagent-codex` 内置的 `0.153.4`）将 `models_cache.json` 降级覆写为不含新模型的旧缓存时，自动拦截降级并保留高版本模型目录。
+   - **可观测性日志**：自动在 `~/.codex/cache/dsh-codex-subscription/plugin.log`（带 512KB 自动滚动截断，忽略纯 `fetched_at` 心跳刷新）记录目录加载（`catalog.load` / `catalog.snapshot`）、降级拦截（`catalog.downgrade_rejected`）、备份恢复（`catalog.backup_restored`）与凭证续期（`auth.refreshed` / `auth.refresh_failed`）事件。
 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/index.d.ts

@@ -59,7 +59,8 @@ declare function createAuthManager(options: AuthManagerOptions): {
 };
 //#endregion
 //#region src/catalog.d.ts
-export declare const BACKUP_CACHE_FILE_NAME = ".dsh-models-cache-backup.json";
+export declare const PLUGIN_CACHE_DIR_NAME = "cache/dsh-codex-subscription";
+export declare const BACKUP_CACHE_FILE_NAME = "models-cache-backup.json";
 interface RawReasoningLevel {
   effort?: string;
   description?: string;
@@ -143,7 +144,7 @@ declare function createUsageFetcher(options: UsageFetcherOptions): {
 //#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 LOG_FILE_NAME = "plugin.log";
 export declare const Config: any;
 export declare function apply(ctx: PluginContextLike, config?: Record<string, unknown>): void;
 export declare const __test: Readonly<{

package/lib/index.js

@@ -1,4 +1,4 @@
-import { appendFileSync, chmodSync, readFileSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import { appendFileSync, chmodSync, mkdirSync, readFileSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { LlmError, resolveImageAttachmentAccess, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
@@ -13,7 +13,8 @@ const PROVIDER = "openai-codex";
 const DISPLAY_NAME = "Codex";
 const DEFAULT_CLIENT_VERSION = "0.163.0";
 const DEFAULT_CONTEXT_WINDOW = 872e3;
-const BACKUP_CACHE_FILE_NAME = ".dsh-models-cache-backup.json";
+const PLUGIN_CACHE_DIR_NAME = "cache/dsh-codex-subscription";
+const BACKUP_CACHE_FILE_NAME = "models-cache-backup.json";
 const THINKING_LEVELS = [
 	"off",
 	"minimal",
@@ -35,6 +36,12 @@ function parseRawModelsCache(rawText) {
 	if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) throw new SyntaxError("models_cache.json root must be a JSON object");
 	return parsed;
 }
+function isSameModelsCatalogPayload(a, b) {
+	if (!a || !b) return false;
+	const { fetched_at: _fa, ...restA } = a;
+	const { fetched_at: _fb, ...restB } = b;
+	return JSON.stringify(restA) === JSON.stringify(restB);
+}
 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);
@@ -380,6 +387,10 @@ function resolveRealTargetPath(filePath) {
 	}
 }
 function writeFileAtomicSync(filePath, content) {
+	mkdirSync(dirname(filePath), {
+		recursive: true,
+		mode: 448
+	});
 	const targetPath = resolveRealTargetPath(filePath);
 	const tempPath = join(dirname(targetPath), `.${basename(targetPath)}.tmp-${process.pid}-${randomUUID()}`);
 	try {
@@ -552,12 +563,15 @@ function createAuthManager(options) {
 //#region src/index.ts
 const name = "codex-subscription";
 const inject = ["llm"];
-const LOG_FILE_NAME = "dsh-codex-subscription.log";
+const LOG_FILE_NAME = "plugin.log";
 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 resolvePluginCacheDir(codexHome) {
+	return join(codexHome, PLUGIN_CACHE_DIR_NAME);
+}
 function appendPluginLog(codexHome, ctx, level, event, detail) {
 	const line = `[${new Date().toISOString()}] [${level}] ${event} ${JSON.stringify(detail)}\n`;
 	if (level === "ERROR") {
@@ -567,7 +581,12 @@ function appendPluginLog(codexHome, ctx, level, event, detail) {
 		if (typeof ctx.logger?.warn === "function") ctx.logger.warn(`[dsh-codex-subscription] ${event}: ${JSON.stringify(detail)}`);
 	}
 	try {
-		const logPath = join(codexHome, LOG_FILE_NAME);
+		const cacheDir = resolvePluginCacheDir(codexHome);
+		mkdirSync(cacheDir, {
+			recursive: true,
+			mode: 448
+		});
+		const logPath = join(cacheDir, LOG_FILE_NAME);
 		try {
 			if (statSync(logPath).size > MAX_LOG_FILE_BYTES) {
 				const buf = readFileSync(logPath);
@@ -584,14 +603,14 @@ function appendPluginLog(codexHome, ctx, level, event, detail) {
 }
 function readBackupCache(codexHome) {
 	try {
-		return parseRawModelsCache(readFileSync(join(codexHome, BACKUP_CACHE_FILE_NAME), "utf8"));
+		return parseRawModelsCache(readFileSync(join(resolvePluginCacheDir(codexHome), BACKUP_CACHE_FILE_NAME), "utf8"));
 	} catch {
 		return;
 	}
 }
 function writeBackupCache(codexHome, raw) {
 	try {
-		writeFileAtomicSync(join(codexHome, BACKUP_CACHE_FILE_NAME), `${JSON.stringify(raw, null, 2)}\n`);
+		writeFileAtomicSync(join(resolvePluginCacheDir(codexHome), BACKUP_CACHE_FILE_NAME), `${JSON.stringify(raw, null, 2)}\n`);
 	} catch {}
 }
 const Config = z.object({
@@ -749,14 +768,16 @@ function apply(ctx, config = {}) {
 						incomingFetchedAt: incomingRaw.fetched_at ?? null
 					});
 					else if (cachedRaw !== void 0 || !tryRestoreFromBackup({ diskVersion: incomingRaw.client_version ?? "unknown" }, incomingRaw.client_version)) {
-						setActiveRaw(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
-						});
+						if (!isSameModelsCatalogPayload(cachedRaw, incomingRaw)) {
+							setActiveRaw(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) {
 					handleReadError(error);
@@ -879,4 +900,4 @@ const __test = Object.freeze({
 	createUsageFetcher
 });
 //#endregion
-export { BACKUP_CACHE_FILE_NAME, Config, LOG_FILE_NAME, __test, apply, inject, name };
+export { BACKUP_CACHE_FILE_NAME, Config, LOG_FILE_NAME, PLUGIN_CACHE_DIR_NAME, __test, apply, inject, name };

package/package.json

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