@lyogvce/dsh-codex-subscription 0.2.10 → 0.2.11

package/README.md

@@ -15,9 +15,10 @@
    - 直接读取 `~/.codex/models_cache.json`（每次按文件 `mtime` 与大小做微秒级 `stat` 校验，仅在文件变化时重读解析），提取 `visibility === "list"` 的模型及其 `context_window`、`supported_reasoning_levels`（自动将 `ultra` 映射为 DSH 的 `max` 档位）与 `default_verbosity`。
    - **防旧版客户端降级污染**：自动将高版本 `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`）**
+3. **支持按配置屏蔽模型（`disabledModels`）、自定义上下文窗口（`contextWindows`）与原生重试策略（`retryPolicy`）**
    - 在插件配置中通过 `disabledModels` 屏蔽指定模型 `slug`，保持模型选择器干净清爽。
    - 通过 `contextWindows` 按模型 `slug` 自定义向 DSH 会话与自动压缩器暴露的预算窗口（例如设为 `400000`）；未配置时默认使用模型物理上限 `max_context_window`（`872000`）。同时底层 `PiCodexModel.contextWindow` 始终保持物理上限 `872000`，彻底防止 `dsh-llm-pi-ai` 在预算窗口与物理上限之间误判 `CONTEXT_WINDOW_EXCEEDED`。
+   - 通过 `retryPolicy` 暴露 DSH 原生 `RetryPolicySchema`（支持 `normal` / `always` 模式、`maxRetries`、`retryableCodes` 与 `backoff`，并随 `registration.replace` 热更新生效）。未配置时保持宿主默认策略（`mode: "normal"`、`maxRetries: 5`、默认 5 类错误码 `EMPTY_RESPONSE / RATE_LIMIT / SERVER / TIMEOUT / TRANSPORT` 及 `500ms..10000ms` 退避）。**注意：`retryableCodes` 为完整覆盖集合而非追加列表**，显式配置时需同时列出默认错误码与新增错误码。
 4. **原生多轮思考链回放与工具调用**
    - 底层复用 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`）**
@@ -36,9 +37,11 @@
 dsh plugin --profile desktop add @lyogvce/dsh-codex-subscription
 ```
 
-### 2. 配置屏蔽模型（`disabledModels`）与上下文窗口（`contextWindows`）
+### 2. 配置屏蔽模型（`disabledModels`）、上下文窗口（`contextWindows`）与重试策略（`retryPolicy`）
 
-默认配置（见 [cordis.patch.yml](cordis.patch.yml)）已屏蔽旧模型与备用模型，仅保留主力模型（如 `gpt-6.1-sol`、`gpt-6-astra`）。未配置 `contextWindows` 时，模型默认使用 `872000` 上下文窗口；若希望主动限制长上下文预算（例如统一设为 400K），可在 Profile 的 `cordis.patch.yml` 中配置：
+默认配置（见 [cordis.patch.yml](cordis.patch.yml)）已屏蔽旧模型与备用模型，仅保留主力模型（如 `gpt-6.1-sol`、`gpt-6-astra`）。未配置 `contextWindows` 时，模型默认使用 `872000` 上下文窗口；未配置 `retryPolicy` 时默认使用宿主 `normal` 重试策略（最多额外重试 5 次，覆盖 `EMPTY_RESPONSE`、`RATE_LIMIT`、`SERVER`、`TIMEOUT`、`TRANSPORT`）。
+
+若希望自定义上下文预算窗口或扩展可重试错误码白名单（**注意：`retryableCodes` 是完整集合而非追加列表，显式填写时需同时保留默认 5 类错误码**），可在 Profile 的 `cordis.patch.yml` 中配置：
 
 ```yaml
 - id: codex-subscription
@@ -53,9 +56,13 @@ dsh plugin --profile desktop add @lyogvce/dsh-codex-subscription
     contextWindows:
       gpt-6.1-sol: 400000
       gpt-6-astra: 400000
+    retryPolicy:
+      mode: normal
+      maxRetries: 5
+      retryableCodes: [ EMPTY_RESPONSE, RATE_LIMIT, SERVER, TIMEOUT, TRANSPORT, QUOTA, ACCOUNT_QUOTA, AUTH, INVALID_REQUEST, PI_AI_ERROR, STREAM_CLOSED, MALFORMED_RESPONSE ]
 ```
 
-可在 DSH 的 **设置 → 插件 → Codex 订阅直连** 页面或 `cordis.patch.yml` 中随时修改 `disabledModels` 与 `contextWindows`，实时生效无需重启。
+可在 DSH 的 **设置 → 插件 → Codex 订阅直连** 页面或 `cordis.patch.yml` 中随时修改 `disabledModels`、`contextWindows` 与 `retryPolicy`，实时热更新生效无需重启。
 
 ---
 

package/lib/index.d.ts

@@ -1,9 +1,11 @@
 import { PiCodexModel } from "@earendil-works/pi-ai/providers/openai-codex";
 //#region src/host-types.d.ts
+interface AdapterRegistrationHandle {
+  (): void;
+  replace: (next: string[]) => void;
+}
 interface LlmServiceLike {
-  registerAdapter: (providers: string[], adapter: unknown) => (() => void) & {
-    replace?: (next: string[]) => void;
-  };
+  registerAdapter: (providers: string[], adapter: unknown) => AdapterRegistrationHandle;
   emitAdaptersUpdated?: () => void;
 }
 type PluginLogLevel = 'INFO' | 'WARN' | 'ERROR';
@@ -15,9 +17,10 @@ interface LoggerLike {
 }
 interface PluginContextLike {
   llm: LlmServiceLike;
+  fiber?: unknown;
   logger?: LoggerLike | undefined;
   get?: (name: string) => unknown;
-  on?: (event: string, listener: (...args: unknown[]) => void) => () => void;
+  on?: (event: string, listener: (...args: unknown[]) => unknown) => () => void;
   effect?: (factory: () => void | (() => void), label?: string) => () => void;
   inject?: (services: readonly string[], callback: (ctx: PluginContextLike) => void) => () => void;
 }

package/lib/index.js

@@ -1,7 +1,7 @@
 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";
+import { LlmError, RetryPolicySchema, resolveImageAttachmentAccess, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
 import { openaiCodexProvider } from "@earendil-works/pi-ai/providers/openai-codex";
 import { randomUUID } from "node:crypto";
@@ -705,7 +705,8 @@ function writePersistedRuntimeState(codexHome, ctx, sessionFastModes, sessionPar
 const Config = z.object({
 	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()
+	contextWindows: z.dict(z.number()).default({}).description("按模型 slug 覆盖上下文窗口大小（tokens），未配置时默认使用 872000").volatile(),
+	retryPolicy: RetryPolicySchema.description("原生 Agent 步骤重试策略（retryableCodes 为完整覆盖集合，显式配置时需同时包含默认错误码与新增错误码）").volatile()
 });
 function readVolatile(field, fallback) {
 	const value = typeof field?.get === "function" ? field.get() : field;
@@ -719,7 +720,7 @@ var CodexPiAiAdapter = class extends PiAiAdapter {
 	}
 	modelInfo(snapshot, provider, model) {
 		const info = super.modelInfo(snapshot, provider, model);
-		const meta = this.#getModelMetadata(model);
+		const meta = this.#getModelMetadata(snapshot, model);
 		if (meta === void 0) return info;
 		const defaultLevel = meta.defaultReasoningLevel;
 		const hasDefaultLevel = defaultLevel !== void 0 && info.reasoning !== void 0 && info.reasoning.efforts.some((e) => e.id === defaultLevel);
@@ -739,11 +740,12 @@ var CodexPiAiAdapter = class extends PiAiAdapter {
 function apply(ctx, config = {}) {
 	const baseProvider = openaiCodexProvider();
 	const baseModels = baseProvider.getModels();
-	const retryPolicy = resolveRetryPolicy(void 0, "codex-subscription retryPolicy");
 	const getCodexHome = () => resolveCodexHome();
 	const getConfigFastMode = () => readVolatile(config.fastMode, false) === true;
 	const getDisabledModels = () => readVolatile(config.disabledModels, DEFAULT_DISABLED_MODELS);
 	const getContextWindows = () => readVolatile(config.contextWindows, {});
+	const getRawRetryPolicy = () => readVolatile(config.retryPolicy, void 0);
+	const resolveConfiguredRetryPolicy = () => resolveRetryPolicy(getRawRetryPolicy(), "codex-subscription retryPolicy");
 	const { sessionFastModes, sessionParents } = readPersistedRuntimeState(getCodexHome());
 	const recordSessionParent = (childKey, parentKey) => {
 		if (childKey === "" || parentKey === "" || childKey === parentKey) return false;
@@ -889,13 +891,9 @@ function apply(ctx, config = {}) {
 	let cachedRaw;
 	let lastRejectedRaw;
 	let rawRevision = 0;
-	let snapshotSignature;
-	let currentCatalog = {
-		clientVersion: DEFAULT_CLIENT_VERSION,
-		models: [],
-		metadataById: new Map()
-	};
-	let currentProfilesMap;
+	let activeRetryPolicy = resolveConfiguredRetryPolicy();
+	let currentState;
+	const catalogByProfiles = new WeakMap();
 	const requestTokenAuth = Object.freeze({
 		name: "Codex CLI auth.json token",
 		async resolve({ credential }) {
@@ -907,8 +905,7 @@ function apply(ctx, config = {}) {
 			};
 		}
 	});
-	function wrapOptions(model, options = {}) {
-		const { catalog } = ensureSnapshot();
+	function wrapOptions(catalog, model, options = {}) {
 		const modelMeta = catalog.metadataById.get(model?.id);
 		const { temperature: _temperature, sessionId, onPayload, ...rest } = options;
 		const initiatorId = (ctx.get?.("agents"))?.currentInitiator?.()?.id;
@@ -928,25 +925,28 @@ function apply(ctx, config = {}) {
 		resolveCredentials: () => authManager.resolveCredentials(),
 		buildHeaders: (authHeaders) => buildCodexHeaders(authHeaders, ensureSnapshot().catalog.clientVersion)
 	});
-	const piProvider = Object.freeze({
-		...baseProvider,
-		id: PROVIDER,
-		name: DISPLAY_NAME,
-		auth: Object.freeze({
-			...baseProvider.auth,
-			apiKey: requestTokenAuth
-		}),
-		getModels: () => ensureSnapshot().catalog.models,
-		stream: (model, context, options) => {
-			usageFetcher.invalidate();
-			return baseProvider.stream(model, context, wrapOptions(model, options));
-		},
-		streamSimple: (model, context, options) => {
-			usageFetcher.invalidate();
-			return baseProvider.streamSimple(model, context, wrapOptions(model, options));
-		}
-	});
+	function createSnapshotPiProvider(snapshotCatalog) {
+		return Object.freeze({
+			...baseProvider,
+			id: PROVIDER,
+			name: DISPLAY_NAME,
+			auth: Object.freeze({
+				...baseProvider.auth,
+				apiKey: requestTokenAuth
+			}),
+			getModels: () => snapshotCatalog.models,
+			stream: (model, context, options) => {
+				usageFetcher.invalidate();
+				return baseProvider.stream(model, context, wrapOptions(snapshotCatalog, model, options));
+			},
+			streamSimple: (model, context, options) => {
+				usageFetcher.invalidate();
+				return baseProvider.streamSimple(model, context, wrapOptions(snapshotCatalog, model, options));
+			}
+		});
+	}
 	function ensureSnapshot() {
+		const retryPolicy = activeRetryPolicy;
 		const codexHome = getCodexHome();
 		const cachePath = join(codexHome, "models_cache.json");
 		const disabled = getDisabledModels();
@@ -1019,24 +1019,30 @@ function apply(ctx, config = {}) {
 				}
 			}
 		}
-		const nextSnapshotSig = JSON.stringify([
+		const nextCatalogSig = JSON.stringify([
 			rawRevision,
 			disabled,
 			contextWindows
 		]);
-		if (nextSnapshotSig !== snapshotSignature || currentProfilesMap === void 0) {
-			currentCatalog = cachedRaw !== void 0 ? parseModelsCache(cachedRaw, baseModels, disabled, contextWindows) : {
+		let nextCatalog = currentState?.catalog;
+		if (nextCatalog === void 0 || nextCatalogSig !== currentState?.catalogSig) {
+			nextCatalog = cachedRaw !== void 0 ? parseModelsCache(cachedRaw, baseModels, disabled, contextWindows) : {
 				clientVersion: DEFAULT_CLIENT_VERSION,
 				models: [],
 				metadataById: new Map()
 			};
-			appendPluginLog(codexHome, ctx, currentCatalog.models.length === 0 ? "WARN" : "INFO", "catalog.snapshot", {
-				clientVersion: currentCatalog.clientVersion,
-				models: currentCatalog.models.map((m) => m.id),
+			appendPluginLog(codexHome, ctx, nextCatalog.models.length === 0 ? "WARN" : "INFO", "catalog.snapshot", {
+				clientVersion: nextCatalog.clientVersion,
+				models: nextCatalog.models.map((m) => m.id),
 				disabledModels: disabled,
 				contextWindows
 			});
-			currentProfilesMap = new Map([[PROVIDER, Object.freeze({
+		}
+		const retryPolicySig = JSON.stringify(retryPolicy);
+		const nextSnapshotSig = JSON.stringify([nextCatalogSig, retryPolicySig]);
+		if (currentState === void 0 || nextSnapshotSig !== currentState.snapshotSig) {
+			const piProvider = createSnapshotPiProvider(nextCatalog);
+			const profileEntry = Object.freeze({
 				provider: PROVIDER,
 				displayName: DISPLAY_NAME,
 				piProvider,
@@ -1049,13 +1055,19 @@ function apply(ctx, config = {}) {
 				streamIdleTimeoutMs: STREAM_IDLE_TIMEOUT_MS,
 				cacheRetention: "short",
 				transport: "sse"
-			})]]);
-			snapshotSignature = nextSnapshotSig;
+			});
+			const profiles = new Map([[PROVIDER, profileEntry]]);
+			catalogByProfiles.set(profiles, nextCatalog);
+			currentState = Object.freeze({
+				catalog: nextCatalog,
+				catalogSig: nextCatalogSig,
+				profiles,
+				snapshotSig: nextSnapshotSig,
+				retryPolicy,
+				retryPolicySig
+			});
 		}
-		return {
-			catalog: currentCatalog,
-			profiles: currentProfilesMap
-		};
+		return currentState;
 	}
 	const adapter = new CodexPiAiAdapter({
 		profiles: () => ensureSnapshot().profiles,
@@ -1081,8 +1093,12 @@ function apply(ctx, config = {}) {
 		onReplayDegrade: (provider, model, reason) => {
 			console.error(`[dsh-codex-subscription] replay state for "${provider}/${model}" degraded (${reason})`);
 		}
-	}, (modelId) => ensureSnapshot().catalog.metadataById.get(modelId));
-	ctx.llm.registerAdapter([PROVIDER], adapter);
+	}, (snapshot, modelId) => {
+		const snapProfiles = snapshot?.profiles;
+		return ((snapProfiles !== void 0 ? catalogByProfiles.get(snapProfiles) : void 0) ?? ensureSnapshot().catalog).metadataById.get(modelId);
+	});
+	let committedState = ensureSnapshot();
+	const registration = ctx.llm.registerAdapter([PROVIDER], adapter);
 	const mountUsageRoute = (connCtx) => {
 		const connection = connCtx.get?.("connection");
 		const registerFetch = connection?.fetch?.register;
@@ -1147,8 +1163,34 @@ function apply(ctx, config = {}) {
 			if (inspectSessionParentFromHost(agent?.session, agent)) writePersistedRuntimeState(getCodexHome(), ctx, sessionFastModes, sessionParents);
 		}
 	});
+	ctx.on?.("internal/config", function(rawInput, next) {
+		const raw = typeof next === "function" ? next() : rawInput;
+		if (ctx.fiber !== void 0 && this !== ctx.fiber) return raw;
+		if (raw !== null && typeof raw === "object" && !Array.isArray(raw)) {
+			const candidateRetry = readVolatile(raw.retryPolicy, void 0);
+			resolveRetryPolicy(candidateRetry, "codex-subscription retryPolicy");
+		}
+		return raw;
+	});
 	ctx.on?.("loader/volatile-update", () => {
-		ensureSnapshot();
+		const candidateRetryPolicy = resolveConfiguredRetryPolicy();
+		const prevRetryPolicy = activeRetryPolicy;
+		const prevCommitted = committedState;
+		activeRetryPolicy = candidateRetryPolicy;
+		let nextState;
+		try {
+			nextState = ensureSnapshot();
+			if (nextState.retryPolicySig !== prevCommitted.retryPolicySig) {
+				registration.replace([PROVIDER]);
+				committedState = nextState;
+				return;
+			}
+		} catch (error) {
+			activeRetryPolicy = prevRetryPolicy;
+			currentState = prevCommitted;
+			throw error;
+		}
+		committedState = nextState;
 		ctx.llm.emitAdaptersUpdated?.();
 	});
 }

package/package.json

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