@lyogvce/dsh-codex-subscription 0.2.1 → 0.2.3

package/README.md

@@ -17,9 +17,9 @@
    - 在插件配置中通过 `disabledModels` 屏蔽指定模型 `slug`，保持模型选择器干净清爽。
    - 通过 `contextWindows` 按模型 `slug` 自定义向 DSH 会话与自动压缩器暴露的预算窗口（例如设为 `400000`）；未配置时默认使用模型物理上限 `max_context_window`（`872000`）。同时底层 `PiCodexModel.contextWindow` 始终保持物理上限 `872000`，彻底防止 `dsh-llm-pi-ai` 在预算窗口与物理上限之间误判 `CONTEXT_WINDOW_EXCEEDED`。
 4. **原生多轮思考链回放与工具调用**
-   - 底层复用 DSH 内置的 `PiAiAdapter` 与 `@earendil-works/pi-ai` 的 `openaiCodexProvider()`，固定使用 `sse` 传输（含 `zstd` 请求体压缩、`session-id` / `thread-id` 缓存头、`reasoning.encrypted_content` 签名回放与图片自动缩放卸载）。
+   - 底层复用 DSH 内置的 `PiAiAdapter` 与 `@earendil-works/pi-ai` 的 `openaiCodexProvider()`，固定使用 `sse` 传输（含 `zstd` 请求体压缩、规范化纯 UUID `session-id` / `x-client-request-id` 缓存头、`reasoning.encrypted_content` 签名回放与图片自动缩放卸载）。
 5. **Codex 订阅限额内联展示（`conversation.input.right`）**
-   - 当会话选中 `openai-codex` 模型时，在输入框右下角紧邻模型选择器左侧展示 `5h X% · 7d Y%` 限额胶囊（数据源来自 `https://chatgpt.com/backend-api/wham/usage`，内置 60 秒缓存、单飞合并与每轮回复结束自动刷新），点击可展开查看 5 小时 / 7 天窗口进度条、重置倒计时与手动刷新按钮；切换至其他 Provider 模型时自动隐藏。
+   - 当会话选中 `openai-codex` 模型时，在输入框右下角紧邻模型选择器左侧展示限额胶囊（根据 `wham/usage` 返回的 `limit_window_seconds` 自适应展示 Plus 的 `5h X% · 7d Y%` 双窗口或 Pro 的 `7d X%` 单窗口，内置 60 秒缓存、单飞合并与每轮回复结束自动刷新），点击可展开查看对应窗口进度条、重置倒计时与手动刷新按钮；切换至其他 Provider 模型时自动隐藏。
 
 ---
 

package/lib/client.js

@@ -25,6 +25,8 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/quota.ts
 		const RING_CIRCUMFERENCE = 2 * Math.PI * 5.5;
+		const DEFAULT_PRIMARY_WINDOW_SECONDS = 18e3;
+		const DEFAULT_SECONDARY_WINDOW_SECONDS = 604800;
 		function resolveActiveProvider(directorySnapshot, projectedSelection) {
 			const dir = directorySnapshot && typeof directorySnapshot === "object" ? directorySnapshot : void 0;
 			const proj = projectedSelection && typeof projectedSelection === "object" ? projectedSelection : void 0;
@@ -46,14 +48,53 @@ window.__ModuleLoader__.load({
 			if (usedPercent >= 80) return "warn";
 			return "ok";
 		}
+		function resolveWindowSpan(windowSeconds, fallbackSeconds) {
+			const sec = typeof windowSeconds === "number" && Number.isFinite(windowSeconds) && windowSeconds > 0 ? windowSeconds : fallbackSeconds;
+			if (sec >= 86400) return {
+				value: Math.round(sec / 86400),
+				unit: "d"
+			};
+			if (sec >= 3600) return {
+				value: Math.round(sec / 3600),
+				unit: "h"
+			};
+			return {
+				value: Math.max(1, Math.round(sec / 60)),
+				unit: "m"
+			};
+		}
+		const WINDOW_UNIT_LABELS = {
+			zh: {
+				d: "天窗口",
+				h: "小时窗口",
+				m: "分钟窗口"
+			},
+			en: {
+				d: "-day window",
+				h: "-hour window",
+				m: "-minute window"
+			}
+		};
+		function formatWindowShortLabel(windowSeconds, fallbackSeconds = DEFAULT_PRIMARY_WINDOW_SECONDS) {
+			const { value, unit } = resolveWindowSpan(windowSeconds, fallbackSeconds);
+			return `${value}${unit}`;
+		}
+		function formatWindowTitle(windowSeconds, locale, fallbackSeconds = DEFAULT_PRIMARY_WINDOW_SECONDS) {
+			const { value, unit } = resolveWindowSpan(windowSeconds, fallbackSeconds);
+			const suffix = WINDOW_UNIT_LABELS[locale][unit];
+			return locale === "en" ? `${value}${suffix}` : `${value} ${suffix}`;
+		}
 		function formatQuotaSummary(snapshot) {
 			const primaryPercent = clampPercent(snapshot.primary.usedPercent);
 			const secondaryPercent = snapshot.secondary !== null ? clampPercent(snapshot.secondary.usedPercent) : null;
+			const level = windowLevelOf(secondaryPercent !== null ? Math.max(primaryPercent, secondaryPercent) : primaryPercent, snapshot.limitReached);
+			const primaryLabel = formatWindowShortLabel(snapshot.primary.windowSeconds, DEFAULT_PRIMARY_WINDOW_SECONDS);
+			const secondaryLabel = snapshot.secondary !== null ? formatWindowShortLabel(snapshot.secondary.windowSeconds, DEFAULT_SECONDARY_WINDOW_SECONDS) : null;
 			return {
 				primaryPercent,
 				secondaryPercent,
-				level: windowLevelOf(secondaryPercent !== null ? Math.max(primaryPercent, secondaryPercent) : primaryPercent, snapshot.limitReached),
-				pillText: secondaryPercent !== null ? `5h ${primaryPercent}% · 7d ${secondaryPercent}%` : `5h ${primaryPercent}%`,
+				level,
+				pillText: secondaryPercent !== null && secondaryLabel !== null ? `${primaryLabel} ${primaryPercent}% · ${secondaryLabel} ${secondaryPercent}%` : `${primaryLabel} ${primaryPercent}%`,
 				ringDash: `${(RING_CIRCUMFERENCE * primaryPercent / 100).toFixed(2)} ${RING_CIRCUMFERENCE.toFixed(2)}`
 			};
 		}
@@ -223,8 +264,6 @@ window.__ModuleLoader__.load({
 			"quota.loading": "正在获取 Codex 限额…",
 			"quota.refresh": "↻ 刷新",
 			"quota.refreshing": "↻ 刷新中…",
-			"quota.window5h": "5 小时窗口",
-			"quota.window7d": "7 天窗口",
 			"quota.usedPrefix": "已用 ",
 			"quota.remainPrefix": "剩余 "
 		};
@@ -233,8 +272,6 @@ window.__ModuleLoader__.load({
 			"quota.loading": "Loading Codex quota…",
 			"quota.refresh": "↻ Refresh",
 			"quota.refreshing": "↻ Refreshing…",
-			"quota.window5h": "5-hour window",
-			"quota.window7d": "7-day window",
 			"quota.usedPrefix": "Used ",
 			"quota.remainPrefix": "Remaining "
 		};
@@ -357,7 +394,7 @@ window.__ModuleLoader__.load({
 				onClick: () => {
 					quotaStore.refresh(true);
 				}
-			}, quotaSnap.loading ? t("quota.refreshing") : t("quota.refresh"))), quota !== null ? renderWindowSection(t("quota.window5h"), quota.primary, primaryReached) : quotaSnap.loading || quotaSnap.error === null ? h("div", { className: "dsh-codex-quota-meta" }, t("quota.loading")) : null, quota?.secondary !== null && quota?.secondary !== void 0 ? renderWindowSection(t("quota.window7d"), quota.secondary, secondaryReached) : null, quotaSnap.error !== null ? h("div", { className: "dsh-codex-quota-error" }, quotaSnap.error) : null) : null);
+			}, quotaSnap.loading ? t("quota.refreshing") : t("quota.refresh"))), quota !== null ? renderWindowSection(formatWindowTitle(quota.primary.windowSeconds, locale, DEFAULT_PRIMARY_WINDOW_SECONDS), quota.primary, primaryReached) : quotaSnap.loading || quotaSnap.error === null ? h("div", { className: "dsh-codex-quota-meta" }, t("quota.loading")) : null, quota?.secondary !== null && quota?.secondary !== void 0 ? renderWindowSection(formatWindowTitle(quota.secondary.windowSeconds, locale, DEFAULT_SECONDARY_WINDOW_SECONDS), quota.secondary, secondaryReached) : null, quotaSnap.error !== null ? h("div", { className: "dsh-codex-quota-error" }, quotaSnap.error) : null) : null);
 		}
 		const inject = ["slots", "locale"];
 		function apply(ctx) {
@@ -411,6 +448,8 @@ window.__ModuleLoader__.load({
 			isCodexProvider,
 			didTurnFinish,
 			windowLevelOf,
+			formatWindowShortLabel,
+			formatWindowTitle,
 			formatQuotaSummary,
 			formatResetCountdown,
 			createQuotaStore,

package/lib/index.d.ts

@@ -18,6 +18,7 @@ interface JwtClaims {
 }
 interface AuthManagerOptions {
   getCodexHome: () => string;
+  getClientVersion?: (() => string) | undefined;
   fetchImpl?: typeof fetch | undefined;
   now?: (() => number) | undefined;
 }
@@ -72,13 +73,15 @@ declare function parseModelsCache(rawCache: RawModelsCache | null | undefined, b
 //#endregion
 //#region src/request.d.ts
 declare function buildCodexUserAgent(version?: string): string;
-declare function buildCodexHeaders(existingHeaders: Record<string, string> | undefined, clientVersion: string, sessionId?: string | undefined): Record<string, string>;
+declare function normalizeCodexSessionId(sessionId: string | undefined): string | undefined;
+declare function buildCodexHeaders(existingHeaders?: Record<string, string> | undefined, clientVersion?: string): Record<string, string>;
 declare function sanitizeCodexPayload(payload: Record<string, unknown> | null | undefined, modelMeta?: CodexModelMetadata | undefined): Record<string, unknown> | null | undefined;
 //#endregion
 //#region src/usage.d.ts
 declare function safeErrorMessage(error: unknown): string;
 interface CodexQuotaWindow {
   readonly usedPercent: number;
+  readonly windowSeconds?: number | null | undefined;
   readonly resetAt: number | null;
 }
 interface CodexQuotaSnapshot {
@@ -147,6 +150,7 @@ export declare const __test: Readonly<{
   sanitizeCodexPayload: typeof sanitizeCodexPayload;
   buildCodexHeaders: typeof buildCodexHeaders;
   buildCodexUserAgent: typeof buildCodexUserAgent;
+  normalizeCodexSessionId: typeof normalizeCodexSessionId;
   parseUsagePayload: typeof parseUsagePayload;
   createUsageFetcher: typeof createUsageFetcher;
 }>;

package/lib/index.js

@@ -8,6 +8,211 @@ import { randomUUID } from "node:crypto";
 import { chmod, rename, writeFile } from "node:fs/promises";
 import { arch, homedir, platform, release } from "node:os";
 import { execFileSync } from "node:child_process";
+//#region src/catalog.ts
+const PROVIDER = "openai-codex";
+const DISPLAY_NAME = "Codex";
+const DEFAULT_CLIENT_VERSION = "0.163.0";
+const DEFAULT_CONTEXT_WINDOW = 872e3;
+const THINKING_LEVELS = [
+	"off",
+	"minimal",
+	"low",
+	"medium",
+	"high",
+	"xhigh",
+	"max"
+];
+const DEFAULT_DISABLED_MODELS = Object.freeze([
+	"gpt-6-sol",
+	"gpt-6-luna",
+	"gpt-5.6-sol",
+	"gpt-5.6-terra",
+	"gpt-5.6-luna"
+]);
+function buildThinkingLevelMap(supportedLevels) {
+	const efforts = new Set((Array.isArray(supportedLevels) ? supportedLevels : []).map((item) => {
+		if (typeof item === "string") return item;
+		if (item !== null && typeof item === "object" && "effort" in item) {
+			const effort = item.effort;
+			return typeof effort === "string" ? effort : "";
+		}
+		return "";
+	}).filter((value) => value.length > 0));
+	const map = {};
+	for (const level of THINKING_LEVELS) if (level === "off") map.off = efforts.has("none") ? "none" : null;
+	else if (efforts.has(level) || level === "max" && efforts.has("ultra")) map[level] = level;
+	else map[level] = null;
+	return map;
+}
+function normalizeDefaultReasoningLevel(rawLevel, thinkingLevelMap) {
+	if (typeof rawLevel !== "string" || rawLevel.trim() === "") return void 0;
+	const trimmed = rawLevel.trim();
+	const mapped = trimmed === "none" ? "off" : trimmed === "ultra" ? "max" : trimmed;
+	return thinkingLevelMap[mapped] ? mapped : void 0;
+}
+function isVerbosity(value) {
+	return value === "low" || value === "medium" || value === "high";
+}
+function isPositiveSafeInt(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
+}
+function parseModelsCache(rawCache, baseModels, disabledModels = [], contextWindows = {}) {
+	const disabledSet = new Set((Array.isArray(disabledModels) ? disabledModels : []).filter((id) => typeof id === "string").map((id) => id.trim()).filter(Boolean));
+	const clientVersion = typeof rawCache?.client_version === "string" && rawCache.client_version.trim() !== "" ? rawCache.client_version.trim() : DEFAULT_CLIENT_VERSION;
+	const rawModels = Array.isArray(rawCache?.models) ? rawCache.models : [];
+	const templateModel = baseModels.find((model) => model.id !== "gpt-5.3-codex-spark") ?? baseModels[0];
+	const visibleEntries = rawModels.filter((entry) => Boolean(entry && typeof entry.slug === "string" && entry.slug.trim() !== "")).filter((entry) => entry.visibility === "list" && !disabledSet.has(entry.slug.trim())).sort((a, b) => {
+		return (typeof a.priority === "number" && Number.isFinite(a.priority) ? a.priority : 0) - (typeof b.priority === "number" && Number.isFinite(b.priority) ? b.priority : 0);
+	});
+	const models = [];
+	const metadataById = new Map();
+	const seen = new Set();
+	for (const entry of visibleEntries) {
+		const id = entry.slug.trim();
+		if (seen.has(id)) continue;
+		seen.add(id);
+		const base = baseModels.find((model) => model.id === id) ?? templateModel;
+		const maxContextWindow = isPositiveSafeInt(entry.max_context_window) ? entry.max_context_window : DEFAULT_CONTEXT_WINDOW;
+		const configuredOverride = contextWindows && typeof contextWindows === "object" ? contextWindows[id] : void 0;
+		const targetContextWindow = isPositiveSafeInt(configuredOverride) ? configuredOverride : maxContextWindow;
+		const wireContextWindow = Math.max(maxContextWindow, targetContextWindow);
+		const maxTokens = Math.min(128e3, Math.max(32768, Math.floor(targetContextWindow / 4)));
+		const inputs = Array.isArray(entry.input_modalities) ? entry.input_modalities.filter((m) => m === "text" || m === "image") : ["text", "image"];
+		const thinkingLevelMap = buildThinkingLevelMap(entry.supported_reasoning_levels);
+		const hasReasoning = Object.entries(thinkingLevelMap).some(([k, v]) => k !== "off" && v !== null);
+		const supportVerbosity = entry.support_verbosity !== false;
+		const defaultVerbosity = isVerbosity(entry.default_verbosity) ? entry.default_verbosity : "low";
+		const defaultReasoningLevel = normalizeDefaultReasoningLevel(entry.default_reasoning_level, thinkingLevelMap);
+		metadataById.set(id, {
+			contextWindow: targetContextWindow,
+			supportVerbosity,
+			defaultVerbosity,
+			defaultReasoningLevel
+		});
+		models.push({
+			...base ?? {},
+			id,
+			name: typeof entry.display_name === "string" && entry.display_name.trim() !== "" ? entry.display_name.trim() : id,
+			...typeof entry.description === "string" && entry.description.trim() !== "" ? { description: entry.description.trim() } : {},
+			api: "openai-codex-responses",
+			provider: PROVIDER,
+			baseUrl: "https://chatgpt.com/backend-api",
+			input: inputs.length > 0 ? inputs : ["text"],
+			contextWindow: wireContextWindow,
+			maxTokens,
+			reasoning: hasReasoning,
+			thinkingLevelMap,
+			cost: {
+				input: 0,
+				output: 0,
+				cacheRead: 0,
+				cacheWrite: 0
+			}
+		});
+	}
+	return {
+		clientVersion,
+		models,
+		metadataById
+	};
+}
+//#endregion
+//#region src/request.ts
+const FORBIDDEN_PAYLOAD_FIELDS = Object.freeze([
+	"max_output_tokens",
+	"max_completion_tokens",
+	"temperature",
+	"top_p",
+	"previous_response_id",
+	"user",
+	"safety_identifier",
+	"prompt_cache_options"
+]);
+let cachedOsLabel;
+function detectOsLabel() {
+	if (cachedOsLabel !== void 0) return cachedOsLabel;
+	const sys = platform();
+	if (sys === "darwin") try {
+		const parts = execFileSync("sw_vers", ["-productVersion"], {
+			encoding: "utf8",
+			timeout: 2e3
+		}).trim().split(".");
+		while (parts.length < 3) parts.push("0");
+		cachedOsLabel = `Mac OS ${parts.slice(0, 3).join(".")}`;
+		return cachedOsLabel;
+	} catch {
+		cachedOsLabel = "Mac OS";
+		return cachedOsLabel;
+	}
+	if (sys === "win32") {
+		cachedOsLabel = `Windows ${release()}`;
+		return cachedOsLabel;
+	}
+	cachedOsLabel = `Linux ${release()}`;
+	return cachedOsLabel;
+}
+function buildCodexUserAgent(version = DEFAULT_CLIENT_VERSION) {
+	const cpu = arch() === "arm64" ? "arm64" : arch() === "x64" ? "x86_64" : arch();
+	const term = platform() === "darwin" ? "Apple_Terminal/455" : platform() === "win32" ? "WindowsTerminal" : "xterm-256color";
+	return `codex_cli_rs/${version} (${detectOsLabel()}; ${cpu}) ${term}`;
+}
+function normalizeCodexSessionId(sessionId) {
+	if (typeof sessionId !== "string") return void 0;
+	const stripped = sessionId.trim().replace(/^session-/iu, "").trim();
+	return stripped.length > 0 ? stripped : void 0;
+}
+function buildCodexHeaders(existingHeaders, clientVersion = DEFAULT_CLIENT_VERSION) {
+	const headers = {};
+	for (const [key, value] of Object.entries(existingHeaders ?? {})) {
+		if (key.toLowerCase() === "user-agent") continue;
+		headers[key] = value;
+	}
+	headers.originator = "codex_cli_rs";
+	headers.version = clientVersion;
+	headers["User-Agent"] = buildCodexUserAgent(clientVersion);
+	return headers;
+}
+function sanitizeCodexPayload(payload, modelMeta) {
+	if (!payload || typeof payload !== "object") return payload;
+	const cleaned = { ...payload };
+	for (const field of FORBIDDEN_PAYLOAD_FIELDS) delete cleaned[field];
+	if (cleaned.service_tier !== "priority" && cleaned.service_tier !== "ultrafast") delete cleaned.service_tier;
+	const currentText = cleaned.text && typeof cleaned.text === "object" && !Array.isArray(cleaned.text) ? { ...cleaned.text } : void 0;
+	if (modelMeta?.supportVerbosity === false) {
+		if (currentText !== void 0) {
+			delete currentText.verbosity;
+			if (Object.keys(currentText).length === 0) delete cleaned.text;
+			else cleaned.text = currentText;
+		}
+	} else {
+		const verbosity = modelMeta?.defaultVerbosity ?? "low";
+		cleaned.text = {
+			...currentText ?? {},
+			verbosity
+		};
+	}
+	if (cleaned.reasoning === void 0 && modelMeta?.defaultReasoningLevel !== void 0 && modelMeta.defaultReasoningLevel !== "off") cleaned.reasoning = {
+		effort: modelMeta.defaultReasoningLevel,
+		summary: "auto"
+	};
+	if (cleaned.reasoning && typeof cleaned.reasoning === "object" && !Array.isArray(cleaned.reasoning)) {
+		const reasoningObj = cleaned.reasoning;
+		const effort = reasoningObj.effort === "ultra" ? "max" : reasoningObj.effort;
+		if (effort === "none") delete cleaned.include;
+		else {
+			cleaned.reasoning = {
+				...reasoningObj,
+				effort,
+				summary: reasoningObj.summary ?? "auto"
+			};
+			const include = Array.isArray(cleaned.include) ? [...cleaned.include] : [];
+			if (!include.includes("reasoning.encrypted_content")) include.push("reasoning.encrypted_content");
+			cleaned.include = include;
+		}
+	}
+	return cleaned;
+}
+//#endregion
 //#region src/usage.ts
 function safeErrorMessage(error) {
 	return (error instanceof Error ? error.message : String(error)).replace(/\beyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\b/gu, "[redacted]").replace(/\b(Bearer\s+)[^\s,;'"&]+/giu, "$1[redacted]").replace(/(\b(?:code|token|access_token|refresh_token|id_token)=)[^&\s"']+/giu, "$1[redacted]").replace(/("(?:access_token|refresh_token|id_token)"\s*:\s*")[^"]+"/giu, "$1[redacted]\"").slice(0, 1e3);
@@ -24,6 +229,8 @@ function parseWindow(raw, fetchedAtMs) {
 	const record = raw;
 	const usedRaw = record.used_percent;
 	if (typeof usedRaw !== "number" || !Number.isFinite(usedRaw)) return null;
+	const windowSecRaw = record.limit_window_seconds;
+	const windowSeconds = typeof windowSecRaw === "number" && Number.isFinite(windowSecRaw) && windowSecRaw > 0 ? Math.round(windowSecRaw) : null;
 	const resetAtRaw = record.reset_at;
 	const resetAfterRaw = record.reset_after_seconds;
 	let resetAt = null;
@@ -31,6 +238,7 @@ function parseWindow(raw, fetchedAtMs) {
 	else if (typeof resetAfterRaw === "number" && Number.isFinite(resetAfterRaw) && resetAfterRaw >= 0) resetAt = Math.floor(fetchedAtMs / 1e3) + Math.round(resetAfterRaw);
 	return {
 		usedPercent: clampPercent(usedRaw),
+		windowSeconds,
 		resetAt
 	};
 }
@@ -215,7 +423,10 @@ function createAuthManager(options) {
 		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: { "Content-Type": "application/json" },
+			headers: buildCodexHeaders({
+				"Content-Type": "application/json",
+				Accept: "application/json"
+			}, options.getClientVersion?.()),
 			body: JSON.stringify({
 				client_id: CODEX_CLIENT_ID,
 				grant_type: "refresh_token",
@@ -278,207 +489,6 @@ function createAuthManager(options) {
 	};
 }
 //#endregion
-//#region src/catalog.ts
-const PROVIDER = "openai-codex";
-const DISPLAY_NAME = "Codex";
-const DEFAULT_CLIENT_VERSION = "0.163.0";
-const DEFAULT_CONTEXT_WINDOW = 872e3;
-const THINKING_LEVELS = [
-	"off",
-	"minimal",
-	"low",
-	"medium",
-	"high",
-	"xhigh",
-	"max"
-];
-const DEFAULT_DISABLED_MODELS = Object.freeze([
-	"gpt-6-sol",
-	"gpt-6-luna",
-	"gpt-5.6-sol",
-	"gpt-5.6-terra",
-	"gpt-5.6-luna"
-]);
-function buildThinkingLevelMap(supportedLevels) {
-	const efforts = new Set((Array.isArray(supportedLevels) ? supportedLevels : []).map((item) => {
-		if (typeof item === "string") return item;
-		if (item !== null && typeof item === "object" && "effort" in item) {
-			const effort = item.effort;
-			return typeof effort === "string" ? effort : "";
-		}
-		return "";
-	}).filter((value) => value.length > 0));
-	const map = {};
-	for (const level of THINKING_LEVELS) if (level === "off") map.off = efforts.has("none") ? "none" : null;
-	else if (efforts.has(level) || level === "max" && efforts.has("ultra")) map[level] = level;
-	else map[level] = null;
-	return map;
-}
-function normalizeDefaultReasoningLevel(rawLevel, thinkingLevelMap) {
-	if (typeof rawLevel !== "string" || rawLevel.trim() === "") return void 0;
-	const trimmed = rawLevel.trim();
-	const mapped = trimmed === "none" ? "off" : trimmed === "ultra" ? "max" : trimmed;
-	return thinkingLevelMap[mapped] ? mapped : void 0;
-}
-function isVerbosity(value) {
-	return value === "low" || value === "medium" || value === "high";
-}
-function isPositiveSafeInt(value) {
-	return typeof value === "number" && Number.isSafeInteger(value) && value > 0;
-}
-function parseModelsCache(rawCache, baseModels, disabledModels = [], contextWindows = {}) {
-	const disabledSet = new Set((Array.isArray(disabledModels) ? disabledModels : []).filter((id) => typeof id === "string").map((id) => id.trim()).filter(Boolean));
-	const clientVersion = typeof rawCache?.client_version === "string" && rawCache.client_version.trim() !== "" ? rawCache.client_version.trim() : DEFAULT_CLIENT_VERSION;
-	const rawModels = Array.isArray(rawCache?.models) ? rawCache.models : [];
-	const templateModel = baseModels.find((model) => model.id !== "gpt-5.3-codex-spark") ?? baseModels[0];
-	const visibleEntries = rawModels.filter((entry) => Boolean(entry && typeof entry.slug === "string" && entry.slug.trim() !== "")).filter((entry) => entry.visibility === "list" && !disabledSet.has(entry.slug.trim())).sort((a, b) => {
-		return (typeof a.priority === "number" && Number.isFinite(a.priority) ? a.priority : 0) - (typeof b.priority === "number" && Number.isFinite(b.priority) ? b.priority : 0);
-	});
-	const models = [];
-	const metadataById = new Map();
-	const seen = new Set();
-	for (const entry of visibleEntries) {
-		const id = entry.slug.trim();
-		if (seen.has(id)) continue;
-		seen.add(id);
-		const base = baseModels.find((model) => model.id === id) ?? templateModel;
-		const maxContextWindow = isPositiveSafeInt(entry.max_context_window) ? entry.max_context_window : DEFAULT_CONTEXT_WINDOW;
-		const configuredOverride = contextWindows && typeof contextWindows === "object" ? contextWindows[id] : void 0;
-		const targetContextWindow = isPositiveSafeInt(configuredOverride) ? configuredOverride : maxContextWindow;
-		const wireContextWindow = Math.max(maxContextWindow, targetContextWindow);
-		const maxTokens = Math.min(128e3, Math.max(32768, Math.floor(targetContextWindow / 4)));
-		const inputs = Array.isArray(entry.input_modalities) ? entry.input_modalities.filter((m) => m === "text" || m === "image") : ["text", "image"];
-		const thinkingLevelMap = buildThinkingLevelMap(entry.supported_reasoning_levels);
-		const hasReasoning = Object.entries(thinkingLevelMap).some(([k, v]) => k !== "off" && v !== null);
-		const supportVerbosity = entry.support_verbosity !== false;
-		const defaultVerbosity = isVerbosity(entry.default_verbosity) ? entry.default_verbosity : "low";
-		const defaultReasoningLevel = normalizeDefaultReasoningLevel(entry.default_reasoning_level, thinkingLevelMap);
-		metadataById.set(id, {
-			contextWindow: targetContextWindow,
-			supportVerbosity,
-			defaultVerbosity,
-			defaultReasoningLevel
-		});
-		models.push({
-			...base ?? {},
-			id,
-			name: typeof entry.display_name === "string" && entry.display_name.trim() !== "" ? entry.display_name.trim() : id,
-			...typeof entry.description === "string" && entry.description.trim() !== "" ? { description: entry.description.trim() } : {},
-			api: "openai-codex-responses",
-			provider: PROVIDER,
-			baseUrl: "https://chatgpt.com/backend-api",
-			input: inputs.length > 0 ? inputs : ["text"],
-			contextWindow: wireContextWindow,
-			maxTokens,
-			reasoning: hasReasoning,
-			thinkingLevelMap,
-			cost: {
-				input: 0,
-				output: 0,
-				cacheRead: 0,
-				cacheWrite: 0
-			}
-		});
-	}
-	return {
-		clientVersion,
-		models,
-		metadataById
-	};
-}
-//#endregion
-//#region src/request.ts
-const FORBIDDEN_PAYLOAD_FIELDS = Object.freeze([
-	"max_output_tokens",
-	"max_completion_tokens",
-	"temperature",
-	"top_p",
-	"previous_response_id",
-	"user",
-	"safety_identifier",
-	"prompt_cache_options"
-]);
-let cachedOsLabel;
-function detectOsLabel() {
-	if (cachedOsLabel !== void 0) return cachedOsLabel;
-	const sys = platform();
-	if (sys === "darwin") try {
-		const parts = execFileSync("sw_vers", ["-productVersion"], {
-			encoding: "utf8",
-			timeout: 2e3
-		}).trim().split(".");
-		while (parts.length < 3) parts.push("0");
-		cachedOsLabel = `Mac OS ${parts.slice(0, 3).join(".")}`;
-		return cachedOsLabel;
-	} catch {
-		cachedOsLabel = "Mac OS";
-		return cachedOsLabel;
-	}
-	if (sys === "win32") {
-		cachedOsLabel = `Windows ${release()}`;
-		return cachedOsLabel;
-	}
-	cachedOsLabel = `Linux ${release()}`;
-	return cachedOsLabel;
-}
-function buildCodexUserAgent(version = DEFAULT_CLIENT_VERSION) {
-	const cpu = arch() === "arm64" ? "arm64" : arch() === "x64" ? "x86_64" : arch();
-	const term = platform() === "darwin" ? "Apple_Terminal/455" : platform() === "win32" ? "WindowsTerminal" : "xterm-256color";
-	return `codex_cli_rs/${version} (${detectOsLabel()}; ${cpu}) ${term}`;
-}
-function buildCodexHeaders(existingHeaders, clientVersion, sessionId) {
-	const headers = {};
-	for (const [key, value] of Object.entries(existingHeaders ?? {})) {
-		if (key.toLowerCase() === "user-agent") continue;
-		headers[key] = value;
-	}
-	headers.originator = "codex_cli_rs";
-	headers.version = clientVersion;
-	headers["User-Agent"] = buildCodexUserAgent(clientVersion);
-	if (typeof sessionId === "string" && sessionId.length > 0) headers["thread-id"] = sessionId;
-	return headers;
-}
-function sanitizeCodexPayload(payload, modelMeta) {
-	if (!payload || typeof payload !== "object") return payload;
-	const cleaned = { ...payload };
-	for (const field of FORBIDDEN_PAYLOAD_FIELDS) delete cleaned[field];
-	if (cleaned.service_tier !== "priority" && cleaned.service_tier !== "ultrafast") delete cleaned.service_tier;
-	const currentText = cleaned.text && typeof cleaned.text === "object" && !Array.isArray(cleaned.text) ? { ...cleaned.text } : void 0;
-	if (modelMeta?.supportVerbosity === false) {
-		if (currentText !== void 0) {
-			delete currentText.verbosity;
-			if (Object.keys(currentText).length === 0) delete cleaned.text;
-			else cleaned.text = currentText;
-		}
-	} else {
-		const verbosity = modelMeta?.defaultVerbosity ?? "low";
-		cleaned.text = {
-			...currentText ?? {},
-			verbosity
-		};
-	}
-	if (cleaned.reasoning === void 0 && modelMeta?.defaultReasoningLevel !== void 0 && modelMeta.defaultReasoningLevel !== "off") cleaned.reasoning = {
-		effort: modelMeta.defaultReasoningLevel,
-		summary: "auto"
-	};
-	if (cleaned.reasoning && typeof cleaned.reasoning === "object" && !Array.isArray(cleaned.reasoning)) {
-		const reasoningObj = cleaned.reasoning;
-		const effort = reasoningObj.effort === "ultra" ? "max" : reasoningObj.effort;
-		if (effort === "none") delete cleaned.include;
-		else {
-			cleaned.reasoning = {
-				...reasoningObj,
-				effort,
-				summary: reasoningObj.summary ?? "auto"
-			};
-			const include = Array.isArray(cleaned.include) ? [...cleaned.include] : [];
-			if (!include.includes("reasoning.encrypted_content")) include.push("reasoning.encrypted_content");
-			cleaned.include = include;
-		}
-	}
-	return cleaned;
-}
-//#endregion
 //#region src/index.ts
 const name = "codex-subscription";
 const inject = ["llm"];
@@ -526,7 +536,10 @@ function apply(ctx, config = {}) {
 	const getCodexHome = () => resolveCodexHome();
 	const getDisabledModels = () => readVolatile(config.disabledModels, DEFAULT_DISABLED_MODELS);
 	const getContextWindows = () => readVolatile(config.contextWindows, {});
-	const authManager = createAuthManager({ getCodexHome });
+	const authManager = createAuthManager({
+		getCodexHome,
+		getClientVersion: () => ensureSnapshot().catalog.clientVersion
+	});
 	let fileSignature;
 	let cachedRaw;
 	let warnedMissingFile = false;
@@ -551,11 +564,13 @@ function apply(ctx, config = {}) {
 	function wrapOptions(model, options = {}) {
 		const { catalog } = ensureSnapshot();
 		const modelMeta = catalog.metadataById.get(model?.id);
-		const { temperature: _temperature, onPayload, ...rest } = options;
+		const { temperature: _temperature, sessionId, onPayload, ...rest } = options;
+		const normalizedSessionId = normalizeCodexSessionId(sessionId);
 		return {
 			...rest,
+			...normalizedSessionId !== void 0 ? { sessionId: normalizedSessionId } : {},
 			transport: "sse",
-			headers: buildCodexHeaders(rest.headers, catalog.clientVersion, rest.sessionId),
+			headers: buildCodexHeaders(rest.headers, catalog.clientVersion),
 			async onPayload(payload, requestModel) {
 				return sanitizeCodexPayload(await onPayload?.(payload, requestModel) ?? payload, modelMeta);
 			}
@@ -704,6 +719,7 @@ const __test = Object.freeze({
 	sanitizeCodexPayload,
 	buildCodexHeaders,
 	buildCodexUserAgent,
+	normalizeCodexSessionId,
 	parseUsagePayload,
 	createUsageFetcher
 });

package/package.json

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