@lyogvce/dsh-codex-subscription 0.2.12 → 0.2.13

package/README.md

@@ -11,8 +11,8 @@
 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` 与大小做微秒级 `stat` 校验，仅在文件变化时重读解析），提取 `visibility === "list"` 的模型及其 `context_window`、`supported_reasoning_levels`（自动将 `ultra` 映射为 DSH 的 `max` 档位）与 `default_verbosity`。
+2. **零网络轮询的本地模型目录实时监听、防降级保护与可观测性日志**
+   - 直接读取并监听 `~/.codex/models_cache.json`（同时结合 `realpathSync` 目录级防抖 `fs.watch` 实时监听与微秒级 `stat` 校验，兼容软链接目录与临时文件 `rename` 原子替换），提取 `visibility === "list"` 的模型及其 `context_window`、`supported_reasoning_levels`（自动将 `ultra` 映射为 DSH 的 `max` 档位）与 `default_verbosity`；当本地模型缓存新增或变更模型时，自动调用 `ctx.llm.emitAdaptersUpdated()` 通知 DSH 桌面端前端立即刷新模型下拉框，无需重启或刷新页面。
    - **防旧版客户端降级污染**：自动将高版本 `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`）与原生重试策略（`retryPolicy`）**

package/lib/index.d.ts

@@ -171,6 +171,8 @@ declare function createUsageFetcher(options: UsageFetcherOptions): {
 export declare const name = "codex-subscription";
 export declare const inject: string[];
 export declare const LOG_FILE_NAME = "plugin.log";
+export declare const MODELS_CACHE_FILE_NAME = "models_cache.json";
+export declare const MODELS_CACHE_WATCH_DEBOUNCE_MS = 100;
 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, mkdirSync, readFileSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import { appendFileSync, chmodSync, mkdirSync, readFileSync, realpathSync, renameSync, statSync, unlinkSync, watch, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { LlmError, RetryPolicySchema, resolveImageAttachmentAccess, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
@@ -704,6 +704,8 @@ function createAuthManager(options) {
 const name = "codex-subscription";
 const inject = ["llm"];
 const LOG_FILE_NAME = "plugin.log";
+const MODELS_CACHE_FILE_NAME = "models_cache.json";
+const MODELS_CACHE_WATCH_DEBOUNCE_MS = 100;
 const STREAM_IDLE_TIMEOUT_MS = 3e5;
 const MAX_REQUEST_IMAGE_BYTES = 20971520;
 const REQUEST_IMAGE_PIXEL_BUDGET = 4194304;
@@ -711,6 +713,27 @@ const REQUEST_IMAGE_MAX_BYTES = 1048576;
 const MAX_LOG_FILE_BYTES = 524288;
 const MAX_PERSISTED_SESSIONS = 200;
 const MAX_PERSISTED_PARENTS = 1e3;
+function resolveModelsCacheWatchTargets(codexHome) {
+	const dirs = new Set();
+	const fileNames = new Set([MODELS_CACHE_FILE_NAME]);
+	try {
+		dirs.add(realpathSync(codexHome));
+	} catch {
+		try {
+			if (statSync(codexHome).isDirectory()) dirs.add(codexHome);
+		} catch {}
+	}
+	const cachePath = join(codexHome, MODELS_CACHE_FILE_NAME);
+	try {
+		const realCachePath = realpathSync(cachePath);
+		dirs.add(dirname(realCachePath));
+		fileNames.add(basename(realCachePath));
+	} catch {}
+	return {
+		dirs: [...dirs],
+		fileNames
+	};
+}
 function resolvePluginCacheDir(codexHome) {
 	return join(codexHome, PLUGIN_CACHE_DIR_NAME);
 }
@@ -840,7 +863,8 @@ var CodexPiAiAdapter = class extends PiAiAdapter {
 function apply(ctx, config = {}) {
 	const baseProvider = openaiCodexProvider();
 	const baseModels = baseProvider.getModels();
-	const getCodexHome = () => resolveCodexHome();
+	const boundCodexHome = resolveCodexHome();
+	const getCodexHome = () => boundCodexHome;
 	const getConfigFastMode = () => readVolatile(config.fastMode, false) === true;
 	const getDisabledModels = () => readVolatile(config.disabledModels, DEFAULT_DISABLED_MODELS);
 	const getContextWindows = () => readVolatile(config.contextWindows, {});
@@ -993,7 +1017,77 @@ function apply(ctx, config = {}) {
 	let rawRevision = 0;
 	let activeRetryPolicy = resolveConfiguredRetryPolicy();
 	let currentState;
+	let adapterRegistered = false;
 	const catalogByProfiles = new WeakMap();
+	const activeWatchers = new Map();
+	let watchedFileNames = new Set([MODELS_CACHE_FILE_NAME]);
+	let watchDebounceTimer;
+	let watcherDisposed = false;
+	const closeModelsCacheWatchers = () => {
+		if (watchDebounceTimer !== void 0) {
+			clearTimeout(watchDebounceTimer);
+			watchDebounceTimer = void 0;
+		}
+		for (const watcher of activeWatchers.values()) try {
+			watcher.close();
+		} catch {}
+		activeWatchers.clear();
+	};
+	const scheduleModelsCacheCheck = () => {
+		if (watcherDisposed) return;
+		if (watchDebounceTimer !== void 0) clearTimeout(watchDebounceTimer);
+		watchDebounceTimer = setTimeout(() => {
+			watchDebounceTimer = void 0;
+			if (watcherDisposed) return;
+			try {
+				if (!statSync(getCodexHome()).isDirectory()) {
+					watcherDisposed = true;
+					closeModelsCacheWatchers();
+					return;
+				}
+			} catch {
+				watcherDisposed = true;
+				closeModelsCacheWatchers();
+				return;
+			}
+			syncModelsCacheWatchers();
+			ensureSnapshot();
+		}, 100);
+		watchDebounceTimer.unref?.();
+	};
+	const syncModelsCacheWatchers = () => {
+		if (watcherDisposed) return;
+		const { dirs, fileNames } = resolveModelsCacheWatchTargets(getCodexHome());
+		watchedFileNames = fileNames;
+		const nextDirSet = new Set(dirs);
+		for (const [dir, watcher] of activeWatchers.entries()) if (!nextDirSet.has(dir)) {
+			try {
+				watcher.close();
+			} catch {}
+			activeWatchers.delete(dir);
+		}
+		for (const dir of nextDirSet) {
+			if (activeWatchers.has(dir)) continue;
+			try {
+				const watcher = watch(dir, { persistent: false }, (_eventType, rawFilename) => {
+					if (watcherDisposed) return;
+					if (rawFilename != null) {
+						const name = typeof rawFilename === "string" ? rawFilename : String(rawFilename);
+						if (name !== "" && !watchedFileNames.has(name)) return;
+					}
+					scheduleModelsCacheCheck();
+				});
+				watcher.on("error", () => {
+					try {
+						watcher.close();
+					} catch {}
+					activeWatchers.delete(dir);
+				});
+				watcher.unref?.();
+				activeWatchers.set(dir, watcher);
+			} catch {}
+		}
+	};
 	const requestTokenAuth = Object.freeze({
 		name: "Codex CLI auth.json token",
 		async resolve({ credential }) {
@@ -1050,10 +1144,11 @@ function apply(ctx, config = {}) {
 			}
 		});
 	}
-	function ensureSnapshot() {
+	function ensureSnapshot(options) {
+		const prevCatalogSig = currentState?.catalogSig;
 		const retryPolicy = activeRetryPolicy;
 		const codexHome = getCodexHome();
-		const cachePath = join(codexHome, "models_cache.json");
+		const cachePath = join(codexHome, MODELS_CACHE_FILE_NAME);
 		const disabled = getDisabledModels();
 		const contextWindows = getContextWindows();
 		const setActiveRaw = (next) => {
@@ -1172,6 +1267,11 @@ function apply(ctx, config = {}) {
 				retryPolicySig
 			});
 		}
+		if (adapterRegistered && !watcherDisposed) syncModelsCacheWatchers();
+		if (adapterRegistered && options?.notifyAdaptersUpdated !== false && prevCatalogSig !== void 0 && nextCatalogSig !== prevCatalogSig) {
+			committedState = currentState;
+			ctx.llm.emitAdaptersUpdated?.();
+		}
 		return currentState;
 	}
 	const adapter = new CodexPiAiAdapter({
@@ -1202,8 +1302,24 @@ function apply(ctx, config = {}) {
 		const snapProfiles = snapshot?.profiles;
 		return ((snapProfiles !== void 0 ? catalogByProfiles.get(snapProfiles) : void 0) ?? ensureSnapshot().catalog).metadataById.get(modelId);
 	});
-	let committedState = ensureSnapshot();
+	let committedState = ensureSnapshot({ notifyAdaptersUpdated: false });
 	const registration = ctx.llm.registerAdapter([PROVIDER], adapter);
+	adapterRegistered = true;
+	if (typeof ctx.effect === "function") ctx.effect(() => {
+		watcherDisposed = false;
+		syncModelsCacheWatchers();
+		return () => {
+			watcherDisposed = true;
+			closeModelsCacheWatchers();
+		};
+	}, "codex-subscription: models_cache watcher");
+	else {
+		syncModelsCacheWatchers();
+		ctx.on?.("dispose", () => {
+			watcherDisposed = true;
+			closeModelsCacheWatchers();
+		});
+	}
 	const mountUsageRoute = (connCtx) => {
 		const connection = connCtx.get?.("connection");
 		const registerFetch = connection?.fetch?.register;
@@ -1284,7 +1400,7 @@ function apply(ctx, config = {}) {
 		activeRetryPolicy = candidateRetryPolicy;
 		let nextState;
 		try {
-			nextState = ensureSnapshot();
+			nextState = ensureSnapshot({ notifyAdaptersUpdated: false });
 			if (nextState.retryPolicySig !== prevCommitted.retryPolicySig) {
 				registration.replace([PROVIDER]);
 				committedState = nextState;
@@ -1326,4 +1442,4 @@ const __test = Object.freeze({
 	createUsageFetcher
 });
 //#endregion
-export { BACKUP_CACHE_FILE_NAME, Config, LOG_FILE_NAME, PLUGIN_CACHE_DIR_NAME, RUNTIME_STATE_FILE_NAME, __test, apply, inject, name };
+export { BACKUP_CACHE_FILE_NAME, Config, LOG_FILE_NAME, MODELS_CACHE_FILE_NAME, MODELS_CACHE_WATCH_DEBOUNCE_MS, PLUGIN_CACHE_DIR_NAME, RUNTIME_STATE_FILE_NAME, __test, apply, inject, name };

package/package.json

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