@lyogvce/dsh-codex-subscription 0.2.4 → 0.2.5

package/lib/client.js

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

package/lib/index.d.ts

@@ -1,4 +1,27 @@
 import { PiCodexModel } from "@earendil-works/pi-ai/providers/openai-codex";
+//#region src/host-types.d.ts
+interface LlmServiceLike {
+  registerAdapter: (providers: string[], adapter: unknown) => (() => void) & {
+    replace?: (next: string[]) => void;
+  };
+  emitAdaptersUpdated?: () => void;
+}
+type PluginLogLevel = 'INFO' | 'WARN' | 'ERROR';
+type PluginLogFn = (level: PluginLogLevel, event: string, detail: Record<string, unknown>) => 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;
+  inject?: (services: readonly string[], callback: (ctx: PluginContextLike) => void) => () => void;
+}
+//#endregion
 //#region src/auth.d.ts
 interface CodexAuthTokens {
   access_token?: string;
@@ -19,7 +42,7 @@ interface JwtClaims {
 interface AuthManagerOptions {
   getCodexHome: () => string;
   getClientVersion?: (() => string) | undefined;
-  onLog?: ((level: 'INFO' | 'WARN' | 'ERROR', event: string, detail: Record<string, unknown>) => void) | undefined;
+  onLog?: PluginLogFn | undefined;
   fetchImpl?: typeof fetch | undefined;
   now?: (() => number) | undefined;
 }
@@ -36,6 +59,7 @@ declare function createAuthManager(options: AuthManagerOptions): {
 };
 //#endregion
 //#region src/catalog.d.ts
+export declare const BACKUP_CACHE_FILE_NAME = ".dsh-models-cache-backup.json";
 interface RawReasoningLevel {
   effort?: string;
   description?: string;
@@ -59,6 +83,7 @@ interface RawModelsCache {
   client_version?: string;
   models?: RawCodexModelEntry[];
 }
+declare function parseRawModelsCache(rawText: string): RawModelsCache;
 declare function compareClientVersions(a: string | undefined, b: string | undefined): number;
 interface CodexModelMetadata {
   readonly contextWindow: number;
@@ -115,32 +140,10 @@ declare function createUsageFetcher(options: UsageFetcherOptions): {
   invalidate: () => void;
 };
 //#endregion
-//#region src/host-types.d.ts
-interface LlmServiceLike {
-  registerAdapter: (providers: string[], adapter: unknown) => (() => void) & {
-    replace?: (next: string[]) => void;
-  };
-  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;
-  inject?: (services: readonly string[], callback: (ctx: PluginContextLike) => void) => () => void;
-}
-//#endregion
 //#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<{
@@ -159,6 +162,7 @@ export declare const __test: Readonly<{
   buildThinkingLevelMap: typeof buildThinkingLevelMap;
   compareClientVersions: typeof compareClientVersions;
   parseModelsCache: typeof parseModelsCache;
+  parseRawModelsCache: typeof parseRawModelsCache;
   sanitizeCodexPayload: typeof sanitizeCodexPayload;
   buildCodexHeaders: typeof buildCodexHeaders;
   buildCodexUserAgent: typeof buildCodexUserAgent;
@@ -167,4 +171,4 @@ export declare const __test: Readonly<{
   createUsageFetcher: typeof createUsageFetcher;
 }>;
 //#endregion
-export type { CodexModelMetadata, CodexQuotaResponse, CodexQuotaSnapshot, CodexQuotaWindow, CodexResolvedCredentials, ParsedModelsCatalog, PluginContextLike, RawModelsCache };
+export type { CodexModelMetadata, CodexQuotaResponse, CodexQuotaSnapshot, CodexQuotaWindow, CodexResolvedCredentials, ParsedModelsCatalog, PluginContextLike, PluginLogLevel, RawModelsCache };

package/lib/index.js

@@ -1,5 +1,5 @@
-import { appendFileSync, chmodSync, readFileSync, realpathSync, statSync, writeFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { appendFileSync, chmodSync, 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";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
@@ -13,6 +13,7 @@ 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 THINKING_LEVELS = [
 	"off",
 	"minimal",
@@ -29,6 +30,11 @@ const DEFAULT_DISABLED_MODELS = Object.freeze([
 	"gpt-5.6-terra",
 	"gpt-5.6-luna"
 ]);
+function parseRawModelsCache(rawText) {
+	const parsed = JSON.parse(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 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);
@@ -362,11 +368,35 @@ function extractAccountId(parsed, accessToken) {
 		if (typeof jwtAccountId === "string" && jwtAccountId.trim() !== "") return jwtAccountId.trim();
 	}
 }
-async function writeJsonAtomic(filePath, data) {
-	let targetPath = filePath;
+function resolveRealTargetPath(filePath) {
 	try {
-		targetPath = realpathSync(filePath);
-	} catch {}
+		return realpathSync(filePath);
+	} catch {
+		try {
+			return join(realpathSync(dirname(filePath)), basename(filePath));
+		} catch {
+			return filePath;
+		}
+	}
+}
+function writeFileAtomicSync(filePath, content) {
+	const targetPath = resolveRealTargetPath(filePath);
+	const tempPath = join(dirname(targetPath), `.${basename(targetPath)}.tmp-${process.pid}-${randomUUID()}`);
+	try {
+		writeFileSync(tempPath, content, { mode: 384 });
+		try {
+			chmodSync(tempPath, 384);
+		} catch {}
+		renameSync(tempPath, targetPath);
+	} catch (error) {
+		try {
+			unlinkSync(tempPath);
+		} catch {}
+		throw error;
+	}
+}
+async function writeJsonAtomic(filePath, data) {
+	const targetPath = resolveRealTargetPath(filePath);
 	const tempPath = join(dirname(targetPath), `.auth.json.tmp-${process.pid}-${randomUUID()}`);
 	const content = `${JSON.stringify(data, null, 2)}\n`;
 	await writeFile(tempPath, content, {
@@ -431,25 +461,34 @@ function createAuthManager(options) {
 		return exp * 1e3 - nowFn() > TOKEN_REFRESH_LEAD_MS;
 	}
 	async function refreshToken(authPath, rawAuth) {
-		const refreshTok = rawAuth?.tokens?.refresh_token;
-		if (typeof refreshTok !== "string" || refreshTok.trim() === "") throw new LlmError("Codex 凭证已过期且缺少 refresh_token，请重新运行 codex login", "AUTH_FAILED");
-		const response = await fetchFn(CODEX_TOKEN_URL, {
-			method: "POST",
-			headers: buildCodexHeaders({
-				"Content-Type": "application/json",
-				Accept: "application/json"
-			}, options.getClientVersion?.()),
-			body: JSON.stringify({
-				client_id: CODEX_CLIENT_ID,
-				grant_type: "refresh_token",
-				refresh_token: refreshTok,
-				scope: "openid profile email"
-			}),
-			signal: AbortSignal.timeout(TOKEN_REFRESH_TIMEOUT_MS)
-		});
-		if (!response.ok) throw new LlmError(`Codex Token 刷新失败 (HTTP ${response.status})，请重新运行 codex login`, "AUTH_FAILED");
-		const fresh = await response.json();
-		if (typeof fresh?.access_token !== "string" || fresh.access_token.trim() === "") throw new LlmError("Codex Token 刷新响应缺少 access_token", "AUTH_FAILED");
+		let fresh;
+		try {
+			const refreshTok = rawAuth?.tokens?.refresh_token;
+			if (typeof refreshTok !== "string" || refreshTok.trim() === "") throw new LlmError("Codex 凭证已过期且缺少 refresh_token，请重新运行 codex login", "AUTH_FAILED");
+			const response = await fetchFn(CODEX_TOKEN_URL, {
+				method: "POST",
+				headers: buildCodexHeaders({
+					"Content-Type": "application/json",
+					Accept: "application/json"
+				}, options.getClientVersion?.()),
+				body: JSON.stringify({
+					client_id: CODEX_CLIENT_ID,
+					grant_type: "refresh_token",
+					refresh_token: refreshTok,
+					scope: "openid profile email"
+				}),
+				signal: AbortSignal.timeout(TOKEN_REFRESH_TIMEOUT_MS)
+			});
+			if (!response.ok) throw new LlmError(`Codex Token 刷新失败 (HTTP ${response.status})，请重新运行 codex login`, "AUTH_FAILED");
+			fresh = await response.json();
+			if (typeof fresh?.access_token !== "string" || fresh.access_token.trim() === "") throw new LlmError("Codex Token 刷新响应缺少 access_token", "AUTH_FAILED");
+		} catch (error) {
+			options.onLog?.("ERROR", "auth.refresh_failed", {
+				authPath,
+				error: safeErrorMessage(error)
+			});
+			throw error;
+		}
 		const nextAuth = {
 			...rawAuth,
 			tokens: {
@@ -514,7 +553,6 @@ function createAuthManager(options) {
 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;
@@ -532,11 +570,10 @@ function appendPluginLog(codexHome, ctx, level, event, detail) {
 		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
-				});
+				const buf = readFileSync(logPath);
+				const halfOffset = Math.max(0, buf.length - Math.floor(MAX_LOG_FILE_BYTES / 2));
+				const newlineIdx = buf.indexOf(10, halfOffset);
+				writeFileAtomicSync(logPath, buf.subarray(newlineIdx >= 0 && newlineIdx + 1 < buf.length ? newlineIdx + 1 : halfOffset));
 			}
 		} catch {}
 		appendFileSync(logPath, line, {
@@ -547,19 +584,14 @@ function appendPluginLog(codexHome, ctx, level, event, detail) {
 }
 function readBackupCache(codexHome) {
 	try {
-		return JSON.parse(readFileSync(join(codexHome, BACKUP_CACHE_FILE_NAME), "utf8"));
+		return parseRawModelsCache(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
-		});
+		writeFileAtomicSync(join(codexHome, BACKUP_CACHE_FILE_NAME), `${JSON.stringify(raw, null, 2)}\n`);
 	} catch {}
 }
 const Config = z.object({
@@ -609,7 +641,7 @@ function apply(ctx, config = {}) {
 	});
 	let fileSignature;
 	let cachedRaw;
-	let warnedMissingFile = false;
+	let rawRevision = 0;
 	let snapshotSignature;
 	let currentCatalog = {
 		clientVersion: DEFAULT_CLIENT_VERSION,
@@ -670,31 +702,54 @@ function apply(ctx, config = {}) {
 		const cachePath = join(codexHome, "models_cache.json");
 		const disabled = getDisabledModels();
 		const contextWindows = getContextWindows();
+		const setActiveRaw = (next) => {
+			cachedRaw = next;
+			rawRevision += 1;
+		};
+		const tryRestoreFromBackup = (extra, minVersion) => {
+			const backupRaw = readBackupCache(codexHome);
+			if (backupRaw === void 0 || minVersion !== void 0 && compareClientVersions(backupRaw.client_version, minVersion) <= 0) return false;
+			setActiveRaw(backupRaw);
+			appendPluginLog(codexHome, ctx, "WARN", "catalog.backup_restored", {
+				cachePath,
+				...extra,
+				restoredVersion: backupRaw.client_version ?? "0.163.0",
+				restoredFetchedAt: backupRaw.fetched_at ?? null
+			});
+			return true;
+		};
+		const handleReadError = (error) => {
+			if (cachedRaw === void 0) tryRestoreFromBackup({ reason: safeErrorMessage(error) });
+			appendPluginLog(codexHome, ctx, cachedRaw === void 0 ? "ERROR" : "WARN", "catalog.read_error", {
+				cachePath,
+				hasFallbackSnapshot: cachedRaw !== void 0,
+				error: safeErrorMessage(error)
+			});
+		};
+		let stat;
 		try {
-			const stat = statSync(cachePath);
+			stat = statSync(cachePath);
+		} catch (error) {
+			const missingSig = `missing:${cachePath}:${error?.code ?? "ERR"}`;
+			if (missingSig !== fileSignature) {
+				fileSignature = missingSig;
+				handleReadError(error);
+			}
+		}
+		if (stat !== void 0) {
 			const nextFileSig = `${cachePath}:${stat.mtimeMs}:${stat.size}`;
 			if (nextFileSig !== fileSignature) {
-				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;
+				try {
+					const incomingRaw = parseRawModelsCache(readFileSync(cachePath, "utf8"));
+					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 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,
@@ -703,31 +758,13 @@ function apply(ctx, config = {}) {
 							rawModelCount: Array.isArray(incomingRaw.models) ? incomingRaw.models.length : 0
 						});
 					}
+				} catch (error) {
+					handleReadError(error);
 				}
 			}
-		} 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;
-				appendPluginLog(codexHome, ctx, cachedRaw === void 0 ? "ERROR" : "WARN", "catalog.read_error", {
-					cachePath,
-					hasFallbackSnapshot: cachedRaw !== void 0,
-					error: safeErrorMessage(error)
-				});
-			}
 		}
 		const nextSnapshotSig = JSON.stringify([
-			fileSignature ?? "none",
+			rawRevision,
 			disabled,
 			contextWindows
 		]);
@@ -833,6 +870,7 @@ const __test = Object.freeze({
 	buildThinkingLevelMap,
 	compareClientVersions,
 	parseModelsCache,
+	parseRawModelsCache,
 	sanitizeCodexPayload,
 	buildCodexHeaders,
 	buildCodexUserAgent,

package/package.json

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