@lyogvce/dsh-codex-subscription 0.2.7 → 0.2.8

package/README.md

@@ -22,7 +22,7 @@
    - 底层复用 DSH 内置的 `PiAiAdapter` 与 `@earendil-works/pi-ai` 的 `openaiCodexProvider()`，固定使用 `sse` 传输（含 `zstd` 请求体压缩、规范化纯 UUID `session-id` / `x-client-request-id` 缓存头、`reasoning.encrypted_content` 签名回放与图片自动缩放卸载）。
 5. **Codex 订阅限额内联展示与 ⚡ Fast 极速模式一键切换（`conversation.input.right`）**
    - 当会话选中 `openai-codex` 模型时，在输入框右下角紧邻模型选择器左侧展示限额胶囊（根据 `wham/usage` 返回的 `limit_window_seconds` 自适应展示 Plus 的 `5h X% · 7d Y%` 双窗口或 Pro 的 `7d X%` 单窗口，内置 60 秒缓存、单飞合并与每轮回复结束自动刷新），点击可展开查看对应窗口进度条、重置倒计时与手动刷新按钮；切换至其他 Provider 模型时自动隐藏。
-   - **⚡ Fast 极速模式（`service_tier: "priority"`，最高 2x 推理速度）**：可在限额弹窗底部直接一键开关 Fast 模式（自动持久化至 `~/.codex/cache/dsh-codex-subscription/runtime-state.json`，也可在插件设置页通过 `fastMode` 配置），开启后胶囊上显示闪电标识 `⚡`，并在请求体中自动为支持 Fast 档位的模型注入 `"service_tier": "priority"`。
+   - **⚡ 会话级 Fast 极速模式（`service_tier: "priority"`，最高 2x 推理速度）**：每个会话可在限额弹窗底部独立开关 Fast 模式（互不影响，新会话默认继承插件设置中的 `fastMode`，未配置时默认 `false` 关闭），状态自动持久化至 `~/.codex/cache/dsh-codex-subscription/runtime-state.json`。开启后当前会话胶囊显示闪电标识 `⚡`，并在该会话请求体中自动注入 `"service_tier": "priority"`。
 
 ---
 

package/lib/client.js

@@ -13,6 +13,11 @@ window.__ModuleLoader__.load({
 			"gpt-5.6-terra",
 			"gpt-5.6-luna"
 		]);
+		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;
+		}
 		//#endregion
 		//#region src/usage.ts
 		function safeErrorMessage(error) {
@@ -25,8 +30,16 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/quota.ts
 		const RING_CIRCUMFERENCE = 2 * Math.PI * 5.5;
+		const DEFAULT_SESSION_KEY = "__default__";
 		const DEFAULT_PRIMARY_WINDOW_SECONDS = 18e3;
 		const DEFAULT_SECONDARY_WINDOW_SECONDS = 604800;
+		function resolveSessionFastMode(snapshot, sessionId) {
+			if (!snapshot) return false;
+			const key = normalizeCodexSessionId(sessionId) ?? DEFAULT_SESSION_KEY;
+			const sessionVal = snapshot.sessionFastModes?.[key];
+			if (typeof sessionVal === "boolean") return sessionVal;
+			return snapshot.defaultFastMode === true;
+		}
 		function resolveActiveProvider(directorySnapshot, projectedSelection) {
 			const dir = directorySnapshot && typeof directorySnapshot === "object" ? directorySnapshot : void 0;
 			const proj = projectedSelection && typeof projectedSelection === "object" ? projectedSelection : void 0;
@@ -139,7 +152,8 @@ window.__ModuleLoader__.load({
 			const ttlMs = options.ttlMs ?? 6e4;
 			let state = {
 				quota: null,
-				fastMode: false,
+				defaultFastMode: false,
+				sessionFastModes: {},
 				loading: false,
 				error: null
 			};
@@ -152,6 +166,21 @@ window.__ModuleLoader__.load({
 				state = next;
 				for (const listener of listeners) listener();
 			}
+			function mergeFastStateFromPayload(payload, allowSessionReplace) {
+				const defaultFastMode = typeof payload?.defaultFastMode === "boolean" ? payload.defaultFastMode : state.defaultFastMode;
+				if (allowSessionReplace && payload?.sessionFastModes && typeof payload.sessionFastModes === "object" && !Array.isArray(payload.sessionFastModes)) {
+					const nextMap = {};
+					for (const [k, v] of Object.entries(payload.sessionFastModes)) if (typeof k === "string" && k !== "" && typeof v === "boolean") nextMap[k] = v;
+					return {
+						defaultFastMode,
+						sessionFastModes: nextMap
+					};
+				}
+				return {
+					defaultFastMode,
+					sessionFastModes: state.sessionFastModes
+				};
+			}
 			async function refresh(force = false) {
 				if (!force && state.quota !== null && nowFn() - state.quota.fetchedAt < ttlMs) return;
 				if (inflight !== null && (!force || inflightForce)) return inflight;
@@ -181,10 +210,10 @@ window.__ModuleLoader__.load({
 						}
 						const payload = await response.json();
 						if (seq !== requestSeq) return;
-						const resolvedFastMode = fastSeqAtStart === fastModeSeq && typeof payload?.fastMode === "boolean" ? payload.fastMode : state.fastMode;
+						const fastState = mergeFastStateFromPayload(payload, fastSeqAtStart === fastModeSeq);
 						if (payload && payload.ok === true && payload.quota) setState({
 							quota: payload.quota,
-							fastMode: resolvedFastMode,
+							...fastState,
 							loading: false,
 							error: null
 						});
@@ -193,7 +222,7 @@ window.__ModuleLoader__.load({
 							const errMsg = payload && !payload.ok && typeof payload.error === "string" ? payload.error : "Invalid response";
 							setState({
 								quota: fallbackQuota ?? null,
-								fastMode: resolvedFastMode,
+								...fastState,
 								loading: false,
 								error: errMsg
 							});
@@ -215,12 +244,16 @@ window.__ModuleLoader__.load({
 				inflight = task;
 				return task;
 			}
-			async function setFastMode(enabled) {
+			async function setFastMode(sessionId, enabled) {
 				const nextFastMode = Boolean(enabled);
+				const key = normalizeCodexSessionId(sessionId) ?? DEFAULT_SESSION_KEY;
 				const seq = ++fastModeSeq;
 				setState({
 					...state,
-					fastMode: nextFastMode
+					sessionFastModes: {
+						...state.sessionFastModes,
+						[key]: nextFastMode
+					}
 				});
 				try {
 					const response = await fetchFn(USAGE_ROUTE_PATH, {
@@ -229,13 +262,16 @@ window.__ModuleLoader__.load({
 							"Content-Type": "application/json",
 							Accept: "application/json"
 						},
-						body: JSON.stringify({ fastMode: nextFastMode })
+						body: JSON.stringify({
+							sessionId: key,
+							fastMode: nextFastMode
+						})
 					});
 					if (seq !== fastModeSeq || !response.ok) return;
 					const payload = await response.json();
-					if (seq === fastModeSeq && typeof payload?.fastMode === "boolean") setState({
+					if (seq === fastModeSeq) setState({
 						...state,
-						fastMode: payload.fastMode
+						...mergeFastStateFromPayload(payload, true)
 					});
 				} catch {}
 			}
@@ -388,6 +424,7 @@ window.__ModuleLoader__.load({
 				})), h("div", { className: "dsh-codex-quota-meta" }, h("span", null, `${t("quota.remainPrefix")}${remainPercent}%`), countdown !== "" ? h("span", null, countdown) : null));
 			};
 			const quota = quotaSnap.quota;
+			const isFastMode = resolveSessionFastMode(quotaSnap, sessionId);
 			const secondaryReached = Boolean(quota?.secondary && quota.secondary.usedPercent >= 100);
 			const primaryReached = Boolean(quota?.limitReached && !secondaryReached);
 			return h("span", {
@@ -398,7 +435,7 @@ window.__ModuleLoader__.load({
 				type: "button",
 				className: "dsh-codex-quota-trigger",
 				"data-level": level,
-				"data-fast": quotaSnap.fastMode ? "true" : void 0,
+				"data-fast": isFastMode ? "true" : void 0,
 				"aria-label": `${t("quota.title")}: ${pillText}`,
 				"aria-haspopup": "dialog",
 				"aria-expanded": open,
@@ -425,7 +462,7 @@ window.__ModuleLoader__.load({
 				r: 5.5,
 				strokeDasharray: ringDash,
 				transform: "rotate(-90 7 7)"
-			})), quotaSnap.fastMode ? h("svg", {
+			})), isFastMode ? h("svg", {
 				className: "dsh-codex-quota-fast-bolt",
 				viewBox: "0 0 12 12",
 				width: 11,
@@ -461,11 +498,11 @@ window.__ModuleLoader__.load({
 				type: "button",
 				role: "switch",
 				className: "dsh-codex-fast-switch",
-				"aria-checked": quotaSnap.fastMode,
+				"aria-checked": isFastMode,
 				"aria-label": t("quota.fastTitle"),
-				"data-checked": quotaSnap.fastMode ? "true" : "false",
+				"data-checked": isFastMode ? "true" : "false",
 				onClick: () => {
-					quotaStore.setFastMode(!quotaSnap.fastMode);
+					quotaStore.setFastMode(sessionId, !isFastMode);
 				}
 			}, h("span", { className: "dsh-codex-fast-switch-thumb" }))), quotaSnap.error !== null ? h("div", { className: "dsh-codex-quota-error" }, quotaSnap.error) : null) : null);
 		}
@@ -518,6 +555,7 @@ window.__ModuleLoader__.load({
 			PROVIDER_ID: PROVIDER,
 			USAGE_API_PATH: USAGE_ROUTE_PATH,
 			resolveActiveProvider,
+			resolveSessionFastMode,
 			isCodexProvider,
 			didTurnFinish,
 			windowLevelOf,

package/lib/index.d.ts

@@ -93,6 +93,7 @@ interface RawModelsCache {
   models?: RawCodexModelEntry[];
 }
 declare function parseRawModelsCache(rawText: string): RawModelsCache;
+declare function normalizeCodexSessionId(sessionId: string | undefined): string | undefined;
 declare function compareClientVersions(a: string | undefined, b: string | undefined): number;
 interface CodexModelMetadata {
   readonly contextWindow: number;
@@ -111,7 +112,6 @@ declare function parseModelsCache(rawCache: RawModelsCache | null | undefined, b
 //#endregion
 //#region src/request.d.ts
 declare function buildCodexUserAgent(version?: 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, fastMode?: boolean): Record<string, unknown> | null | undefined;
 //#endregion
@@ -132,12 +132,14 @@ interface CodexQuotaSnapshot {
 type CodexQuotaResponse = {
   readonly ok: true;
   readonly quota: CodexQuotaSnapshot;
-  readonly fastMode?: boolean | undefined;
+  readonly defaultFastMode?: boolean | undefined;
+  readonly sessionFastModes?: Readonly<Record<string, boolean>> | undefined;
 } | {
   readonly ok: false;
   readonly error: string;
   readonly quota?: CodexQuotaSnapshot | undefined;
-  readonly fastMode?: boolean | undefined;
+  readonly defaultFastMode?: boolean | undefined;
+  readonly sessionFastModes?: Readonly<Record<string, boolean>> | undefined;
 };
 interface UsageFetcherOptions {
   readonly resolveCredentials: () => Promise<CodexResolvedCredentials>;

package/lib/index.js

@@ -37,6 +37,11 @@ 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 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 isSameModelsCatalogPayload(a, b) {
 	if (!a || !b) return false;
 	const { fetched_at: _fa, ...restA } = a;
@@ -194,11 +199,6 @@ function buildCodexUserAgent(version = DEFAULT_CLIENT_VERSION) {
 	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 ?? {})) {
@@ -586,6 +586,8 @@ const MAX_REQUEST_IMAGE_BYTES = 20971520;
 const REQUEST_IMAGE_PIXEL_BUDGET = 4194304;
 const REQUEST_IMAGE_MAX_BYTES = 1048576;
 const MAX_LOG_FILE_BYTES = 524288;
+const MAX_PERSISTED_SESSIONS = 200;
+const DEFAULT_SESSION_KEY = "__default__";
 function resolvePluginCacheDir(codexHome) {
 	return join(codexHome, PLUGIN_CACHE_DIR_NAME);
 }
@@ -630,21 +632,23 @@ function writeBackupCache(codexHome, raw) {
 		writeFileAtomicSync(join(resolvePluginCacheDir(codexHome), BACKUP_CACHE_FILE_NAME), `${JSON.stringify(raw, null, 2)}\n`);
 	} catch {}
 }
-function readPersistedFastMode(codexHome) {
+function readPersistedSessionFastModes(codexHome) {
+	const result = new Map();
 	try {
-		const raw = JSON.parse(readFileSync(join(resolvePluginCacheDir(codexHome), RUNTIME_STATE_FILE_NAME), "utf8"));
-		return typeof raw?.fastMode === "boolean" ? raw.fastMode : void 0;
-	} catch {
-		return;
-	}
+		const entries = JSON.parse(readFileSync(join(resolvePluginCacheDir(codexHome), RUNTIME_STATE_FILE_NAME), "utf8"))?.sessionFastModes;
+		if (entries && typeof entries === "object" && !Array.isArray(entries)) {
+			for (const [k, v] of Object.entries(entries)) if (typeof k === "string" && k !== "" && typeof v === "boolean") result.set(k, v);
+		}
+	} catch {}
+	return result;
 }
-function writePersistedFastMode(codexHome, fastMode) {
+function writePersistedSessionFastModes(codexHome, sessionFastModes) {
 	try {
-		writeFileAtomicSync(join(resolvePluginCacheDir(codexHome), RUNTIME_STATE_FILE_NAME), `${JSON.stringify({ fastMode }, null, 2)}\n`);
+		writeFileAtomicSync(join(resolvePluginCacheDir(codexHome), RUNTIME_STATE_FILE_NAME), `${JSON.stringify({ sessionFastModes: Object.fromEntries(sessionFastModes) }, null, 2)}\n`);
 	} catch {}
 }
 const Config = z.object({
-	fastMode: z.boolean().default(false).description("开启 Fast 极速模式（注入 service_tier: priority，最高 2x 推理速度，消耗更多订阅限额）").volatile(),
+	fastMode: z.boolean().default(false).description("新会话默认是否开启 Fast 极速模式（未填时默认 false；单会话可在右下角限额弹窗内独立切换）").volatile(),
 	disabledModels: z.array(z.string()).default([...DEFAULT_DISABLED_MODELS]).description("在模型选择器中屏蔽的模型 slug 列表").volatile(),
 	contextWindows: z.dict(z.number()).default({}).description("按模型 slug 覆盖上下文窗口大小（tokens），未配置时默认使用 872000").volatile()
 });
@@ -682,19 +686,30 @@ function apply(ctx, config = {}) {
 	const baseModels = baseProvider.getModels();
 	const retryPolicy = resolveRetryPolicy(void 0, "codex-subscription retryPolicy");
 	const getCodexHome = () => resolveCodexHome();
-	const getConfigFastMode = () => Boolean(readVolatile(config.fastMode, false));
+	const getConfigFastMode = () => readVolatile(config.fastMode, false) === true;
 	const getDisabledModels = () => readVolatile(config.disabledModels, DEFAULT_DISABLED_MODELS);
 	const getContextWindows = () => readVolatile(config.contextWindows, {});
-	let lastConfigFastMode = getConfigFastMode();
-	let fastModeOverride = readPersistedFastMode(getCodexHome());
-	const getEffectiveFastMode = () => fastModeOverride !== void 0 ? fastModeOverride : getConfigFastMode();
-	const setFastModeOverride = (nextFastMode, source) => {
+	const sessionFastModes = readPersistedSessionFastModes(getCodexHome());
+	const getEffectiveFastMode = (sessionId) => {
+		const key = normalizeCodexSessionId(sessionId);
+		if (key !== void 0 && sessionFastModes.has(key)) return sessionFastModes.get(key) === true;
+		if (key === void 0 && sessionFastModes.has(DEFAULT_SESSION_KEY)) return sessionFastModes.get(DEFAULT_SESSION_KEY) === true;
+		return getConfigFastMode();
+	};
+	const setSessionFastMode = (sessionId, nextFastMode) => {
 		const codexHome = getCodexHome();
-		fastModeOverride = nextFastMode;
-		writePersistedFastMode(codexHome, nextFastMode);
+		const key = normalizeCodexSessionId(sessionId) ?? DEFAULT_SESSION_KEY;
+		sessionFastModes.delete(key);
+		sessionFastModes.set(key, nextFastMode);
+		while (sessionFastModes.size > MAX_PERSISTED_SESSIONS) {
+			const oldest = sessionFastModes.keys().next().value;
+			if (oldest === void 0) break;
+			sessionFastModes.delete(oldest);
+		}
+		writePersistedSessionFastModes(codexHome, sessionFastModes);
 		appendPluginLog(codexHome, ctx, "INFO", "fast_mode.updated", {
-			fastMode: nextFastMode,
-			source
+			sessionId: key,
+			fastMode: nextFastMode
 		});
 	};
 	const authManager = createAuthManager({
@@ -734,7 +749,7 @@ function apply(ctx, config = {}) {
 			transport: "sse",
 			headers: buildCodexHeaders(rest.headers, catalog.clientVersion),
 			async onPayload(payload, requestModel) {
-				return sanitizeCodexPayload(await onPayload?.(payload, requestModel) ?? payload, modelMeta, getEffectiveFastMode());
+				return sanitizeCodexPayload(await onPayload?.(payload, requestModel) ?? payload, modelMeta, getEffectiveFastMode(normalizedSessionId));
 			}
 		};
 	}
@@ -903,10 +918,11 @@ function apply(ctx, config = {}) {
 			fetch: async (request) => {
 				if (request.method === "POST") {
 					const body = await request.json().catch(() => null);
-					if (typeof body?.fastMode === "boolean") setFastModeOverride(body.fastMode, "ui");
+					if (typeof body?.fastMode === "boolean") setSessionFastMode(typeof body.sessionId === "string" ? body.sessionId : void 0, body.fastMode);
 					return new Response(JSON.stringify({
 						ok: true,
-						fastMode: getEffectiveFastMode()
+						defaultFastMode: getConfigFastMode(),
+						sessionFastModes: Object.fromEntries(sessionFastModes)
 					}), {
 						status: 200,
 						headers: { "content-type": "application/json" }
@@ -916,7 +932,8 @@ function apply(ctx, config = {}) {
 				const result = await usageFetcher.getUsage(force);
 				return new Response(JSON.stringify({
 					...result,
-					fastMode: getEffectiveFastMode()
+					defaultFastMode: getConfigFastMode(),
+					sessionFastModes: Object.fromEntries(sessionFastModes)
 				}), {
 					status: 200,
 					headers: { "content-type": "application/json" }
@@ -929,11 +946,6 @@ function apply(ctx, config = {}) {
 	if (typeof ctx.inject === "function") ctx.inject(["connection"], mountUsageRoute);
 	else mountUsageRoute(ctx);
 	ctx.on?.("loader/volatile-update", () => {
-		const currentConfigFastMode = getConfigFastMode();
-		if (currentConfigFastMode !== lastConfigFastMode) {
-			lastConfigFastMode = currentConfigFastMode;
-			setFastModeOverride(currentConfigFastMode, "config");
-		}
 		ensureSnapshot();
 		ctx.llm.emitAdaptersUpdated?.();
 	});

package/package.json

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