dsh-codex-subscription 2.6.7 → 2.6.9

package/README.en.md

@@ -106,7 +106,7 @@ This plugin supports the latest DeepSeek Harness release recorded in its package
 2. Paste this package name, with its version, into the **Package name or address** field:
 
    ```text
-   dsh-codex-subscription@2.6.7
+   dsh-codex-subscription@2.6.9
    ```
 
 3. Click **Install** and wait for completion. Follow the page instructions; save your work before restarting if requested.
@@ -118,7 +118,7 @@ Why the version is included: DSH's plugin page only installs versions that are a
 <summary>Terminal installation (with an existing dsh command)</summary>
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@2.6.7
+dsh plugin --profile web add dsh-codex-subscription@2.6.9
 ```
 
 Follow the restart instructions, then sign in under **Settings → Codex**. Both the Plugins page and the terminal use DSH's installation management.
@@ -131,7 +131,7 @@ Follow the restart instructions, then sign in under **Settings → Codex**. Both
 After signing in and selecting a Codex model in Web, install the same plugin in the Headless profile:
 
 ```sh
-dsh plugin --profile headless add dsh-codex-subscription@2.6.7
+dsh plugin --profile headless add dsh-codex-subscription@2.6.9
 dsh --profile headless "Reply with only the word: ok"
 ```
 
@@ -266,7 +266,7 @@ Find this plugin on the DSH **Plugins** page and use its update or uninstall act
 <summary>Terminal commands</summary>
 
 ```sh
-dsh plugin --profile web update dsh-codex-subscription@2.6.7
+dsh plugin --profile web update dsh-codex-subscription@2.6.9
 ```
 
 Run only when you want to uninstall:
@@ -282,7 +282,7 @@ dsh plugin --profile web remove dsh-codex-subscription
 <details>
 <summary>DSH 0.2.0-rc.2 reports the plugin as incompatible?</summary>
 
-DSH 0.2.0-rc.2 did not exist when any release before 2.2.10 was published, and a published package's compatibility declaration cannot be changed. Install 2.2.10 or later (a bare package name can resolve to an older release during the first 24 hours, so enter `dsh-codex-subscription@2.2.10`) from the **Plugins** page, or run `dsh plugin --profile web update dsh-codex-subscription@2.6.7`, then restart DSH.
+DSH 0.2.0-rc.2 did not exist when any release before 2.2.10 was published, and a published package's compatibility declaration cannot be changed. Install 2.2.10 or later (a bare package name can resolve to an older release during the first 24 hours, so enter `dsh-codex-subscription@2.2.10`) from the **Plugins** page, or run `dsh plugin --profile web update dsh-codex-subscription@2.6.9`, then restart DSH.
 
 </details>
 

package/README.md

@@ -106,7 +106,7 @@
 2. 在 **包名或地址** 输入框中粘贴下面的包名（已带版本号）：
 
    ```text
-   dsh-codex-subscription@2.6.7
+   dsh-codex-subscription@2.6.9
    ```
 
 3. 点击 **安装**，等待安装完成；按页面提示操作，需要重启时先保存工作。
@@ -118,7 +118,7 @@
 <summary>终端安装（已能运行 dsh 命令）</summary>
 
 ```sh
-dsh plugin --profile web add dsh-codex-subscription@2.6.7
+dsh plugin --profile web add dsh-codex-subscription@2.6.9
 ```
 
 安装完成后按提示重启 DSH，再到 **设置 → Codex 订阅** 登录。插件页面和终端均由 DSH 管理安装。
@@ -131,7 +131,7 @@ dsh plugin --profile web add dsh-codex-subscription@2.6.7
 先在 Web 中完成登录并选择一次 Codex 模型，再把同一个插件安装到 Headless profile：
 
 ```sh
-dsh plugin --profile headless add dsh-codex-subscription@2.6.7
+dsh plugin --profile headless add dsh-codex-subscription@2.6.9
 dsh --profile headless "只回复：ok"
 ```
 
@@ -295,7 +295,7 @@ DSH 实机设置截图。
 <summary>终端方式</summary>
 
 ```sh
-dsh plugin --profile web update dsh-codex-subscription@2.6.7
+dsh plugin --profile web update dsh-codex-subscription@2.6.9
 ```
 
 仅在需要卸载时运行：
@@ -311,7 +311,7 @@ dsh plugin --profile web remove dsh-codex-subscription
 <details>
 <summary>DSH 0.2.0-rc.2 提示插件不兼容？</summary>
 
-2.2.10 之前的所有版本发布时 DSH 0.2.0-rc.2 还不存在，其兼容声明无法事后修改。请安装 2.2.10 或更高版本（只填包名时，发布满 24 小时前可能装到旧版，请直接填 `dsh-codex-subscription@2.2.10`）：在 **插件** 页面更新，或运行 `dsh plugin --profile web update dsh-codex-subscription@2.6.7`，然后重启 DSH。
+2.2.10 之前的所有版本发布时 DSH 0.2.0-rc.2 还不存在，其兼容声明无法事后修改。请安装 2.2.10 或更高版本（只填包名时，发布满 24 小时前可能装到旧版，请直接填 `dsh-codex-subscription@2.2.10`）：在 **插件** 页面更新，或运行 `dsh plugin --profile web update dsh-codex-subscription@2.6.9`，然后重启 DSH。
 
 </details>
 

package/lib/client.js

@@ -9155,7 +9155,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.6.7";
+		const PACKAGE_VERSION = "2.6.9";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {

package/lib/index.js

@@ -12,14 +12,13 @@ import { clientRequestSchema } from "@deepseek-ai/dsh-client-connection";
 import { lstat, mkdir, open, readFile, rename, rm, stat } from "node:fs/promises";
 import { constants, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import * as dshLlm from "@deepseek-ai/dsh-llm";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import * as dshCredentials from "@deepseek-ai/dsh-credentials";
 import { dshHomePath, resolveDshHome } from "@deepseek-ai/dsh-home-paths";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
-import z from "@deepseek-ai/schemastery";
 import { openaiCodexProvider as createOpenAICodexProvider } from "@earendil-works/pi-ai/providers/openai-codex";
 import { createModels } from "@earendil-works/pi-ai";
 import { WebError } from "@deepseek-ai/dsh-web";
@@ -2088,7 +2087,7 @@ function inheritedOriginalImageRef(session, assetId) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.6.7";
+const PACKAGE_VERSION = "2.6.9";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-images.js
@@ -2771,6 +2770,37 @@ function retryPolicyFor(choice, resolve) {
 	}
 }
 //#endregion
+//#region src/request-observer.js
+const failureOf = (chunk) => chunk?.reason?.kind === "error" ? chunk.reason.failure : void 0;
+function observed(stream, options, provider) {
+	return (async function* () {
+		try {
+			for await (const chunk of stream(options)) {
+				const failure = failureOf(chunk);
+				if (failure !== void 0 && !options?.signal?.aborted) provider.noteAdapterFailure?.("failure", options, failure);
+				yield chunk;
+			}
+		} catch (error) {
+			if (!options?.signal?.aborted) provider.noteAdapterFailure?.("thrown", options, error);
+			throw error;
+		}
+	})();
+}
+function observeAdapter(adapter, provider) {
+	return new Proxy(adapter, { get(target, property) {
+		if (property === "stream") return (options) => observed((o) => target.stream(o), options, provider);
+		if (property === "prepareCall") return async (...args) => {
+			const call = await target.prepareCall(...args);
+			return {
+				...call,
+				stream: (options) => observed((o) => call.stream(o), options, provider)
+			};
+		};
+		const value = Reflect.get(target, property, target);
+		return typeof value === "function" ? value.bind(target) : value;
+	} });
+}
+//#endregion
 //#region src/account-vault.js
 const VERSION = 1;
 const DEFAULT_LABEL = "Account 1";
@@ -3645,8 +3675,134 @@ function createCodexRpcHandler(coordinator, options = {}) {
 	};
 }
 //#endregion
+//#region src/failure-capture.js
+const KEEP = /* @__PURE__ */ new Set([
+	"method",
+	"type",
+	"role",
+	"name",
+	"api",
+	"provider",
+	"model",
+	"stopReason",
+	"reasoning",
+	"reasoningEffort",
+	"transport",
+	"mimeType",
+	"kind",
+	"effort",
+	"toolChoice",
+	"cacheRetention",
+	"textVerbosity",
+	"serviceTier"
+]);
+const DROP = /* @__PURE__ */ new Set([
+	"apiKey",
+	"headers",
+	"env",
+	"authorization",
+	"token",
+	"signal",
+	"fetch",
+	"cookie"
+]);
+const MAX_DEPTH = 10;
+const MAX_ARRAY = 40;
+const MAX_KEYS = 80;
+const MAX_NODES = 4e3;
+const MAX_TEXT = 64;
+const UNDEFINED_MARKER = "$undefined";
+function redactRequest(value) {
+	let nodes = 0;
+	const walk = (item, key, depth) => {
+		nodes += 1;
+		if (nodes > MAX_NODES) return { $truncated: "nodes" };
+		if (item === void 0) return { [UNDEFINED_MARKER]: true };
+		if (item === null || typeof item === "boolean") return item;
+		if (typeof item === "number") return Number.isFinite(item) ? item : { $number: String(item) };
+		if (typeof item === "bigint" || typeof item === "symbol") return { $type: typeof item };
+		if (typeof item === "function") return { $type: "function" };
+		if (typeof item === "string") {
+			if (KEEP.has(key) && item.length <= MAX_TEXT) return item;
+			return item.length <= MAX_TEXT ? "x".repeat(item.length) : { $text: item.length };
+		}
+		if (depth >= MAX_DEPTH) return { $truncated: "depth" };
+		if (Array.isArray(item)) {
+			const list = [];
+			for (let index = 0; index < Math.min(item.length, MAX_ARRAY); index += 1) list.push(index in item ? walk(item[index], key, depth + 1) : { $hole: true });
+			return item.length > MAX_ARRAY ? [...list, { $more: item.length - MAX_ARRAY }] : list;
+		}
+		if (item instanceof Uint8Array) return { $bytes: item.byteLength };
+		if (typeof item === "object") {
+			const entries = Object.keys(item).filter((name) => !DROP.has(name));
+			const out = {};
+			for (const name of entries.slice(0, MAX_KEYS)) out[name] = walk(item[name], name, depth + 1);
+			if (entries.length > MAX_KEYS) out.$moreKeys = entries.length - MAX_KEYS;
+			return out;
+		}
+		return { $type: typeof item };
+	};
+	return walk(value, "", 0);
+}
+//#endregion
+//#region src/pi-ai-compat.js
+const versionOf = (specifier) => {
+	try {
+		let path = fileURLToPath(import.meta.resolve(specifier));
+		for (let depth = 0; depth < 6; depth += 1) {
+			path = path.replace(/[\\/][^\\/]+$/u, "");
+			try {
+				const manifest = JSON.parse(readFileSync(`${path}/package.json`, "utf8"));
+				if (typeof manifest.version === "string") return manifest.version;
+			} catch {}
+		}
+	} catch {}
+};
+let cached;
+/** Versions of the pi-ai library and of DSH's adapter this plugin runs against. */
+function runtimeVersions() {
+	cached ??= {
+		piAi: versionOf("@earendil-works/pi-ai"),
+		adapter: versionOf("@deepseek-ai/dsh-llm-pi-ai")
+	};
+	return cached;
+}
+const atLeast087 = (version) => {
+	const match = /^(\d+)\.(\d+)/u.exec(version ?? "");
+	return match !== null && (Number(match[1]) > 0 || Number(match[2]) >= 87);
+};
+/** Whether the installed pi-ai understands system messages inside the transcript. */
+const understandsSystemMessages = (version) => atLeast087(version);
+const textOf = (content) => typeof content === "string" ? content : Array.isArray(content) ? content.filter((block) => block?.type === "text" && typeof block.text === "string").map((block) => block.text).join("\n") : "";
+/**
+* Fold the transcript's leading system messages back into `systemPrompt` and `tools`,
+* the form every pi-ai release accepts. Messages after the first non-system one stay.
+*/
+function hoistLeadingSystem(context) {
+	const messages = context?.messages;
+	if (!Array.isArray(messages) || messages[0]?.role !== "system") return context;
+	let end = 0;
+	const texts = context.systemPrompt ? [context.systemPrompt] : [];
+	const tools = [...Array.isArray(context.tools) ? context.tools : []];
+	while (messages[end]?.role === "system") {
+		const message = messages[end];
+		const text = [textOf(message.content), ...Object.values(message.sections ?? {}).filter((value) => typeof value === "string")].filter(Boolean).join("\n\n");
+		if (text !== "") texts.push(text);
+		if (Array.isArray(message.toolsAdded)) tools.push(...message.toolsAdded);
+		end += 1;
+	}
+	const { systemPrompt: _systemPrompt, tools: _tools, ...rest } = context;
+	const systemPrompt = texts.join("\n\n");
+	return {
+		...rest,
+		...systemPrompt === "" ? {} : { systemPrompt },
+		...tools.length === 0 ? {} : { tools },
+		messages: messages.slice(end)
+	};
+}
+//#endregion
 //#region src/transport-failure.js
-const TRANSIENT_WEBSOCKET_CLOSE = /^WebSocket closed (?:1006|1011|1012|1013)(?:\s|$)/;
+const TRANSIENT_WEBSOCKET_CLOSE = /^WebSocket closed (?:1000|1006|1011|1012|1013)(?:\s|$)/;
 const GATEWAY_REPLAY_BUFFER_EXCEEDED = /^\s*exceeded request buffer limit while retrying upstream\s*$/;
 function normalizeTransportEvent(event, signal) {
 	if (signal?.aborted || event?.type !== "error" || event.reason !== "error") return event;
@@ -3807,6 +3963,36 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 		sessionModel: 0,
 		retries: 0
 	};
+	const streamFailure = {
+		count: 0,
+		stage: void 0,
+		frame: void 0,
+		request: void 0,
+		adapter: void 0
+	};
+	const noteAdapterFailure = (kind, adapterOptions, failure) => {
+		try {
+			streamFailure.adapter = {
+				kind,
+				...typeof failure?.code === "string" ? { code: failure.code.slice(0, 40) } : {},
+				message: String(failure?.message ?? "").slice(0, 160),
+				request: redactRequest(adapterOptions)
+			};
+		} catch {
+			streamFailure.adapter = void 0;
+		}
+	};
+	const noteStreamFailure = (stage, error, source) => {
+		streamFailure.count += 1;
+		streamFailure.stage = stage;
+		try {
+			streamFailure.request = source === void 0 ? void 0 : redactRequest(source);
+		} catch {
+			streamFailure.request = void 0;
+		}
+		const frame = typeof error?.stack === "string" ? /([\w.@-]+[\\/][\w.-]+\.[cm]?[jt]sx?):(\d+):(\d+)/u.exec(error.stack.split("\n").slice(1).join("\n")) : null;
+		streamFailure.frame = frame ? `${frame[1].replaceAll("\\", "/")}:${frame[2]}:${frame[3]}` : void 0;
+	};
 	const reviewRoute = (model, context) => {
 		if (resolveReviewModel() !== "official" || !isDshAutoReview(context)) return void 0;
 		review.requests += 1;
@@ -3861,22 +4047,40 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 		};
 		return { [Symbol.asyncIterator]: () => replay ??= run() };
 	};
-	const networkIterable = (factory, options, direct = false) => {
+	const networkIterable = (factory, options, direct = false, source) => {
 		let iterator;
 		let prepared;
+		let stage = "prepare";
 		const step = async (method, value) => {
-			const request = await (prepared ??= (direct ? void 0 : connection?.prepare(options)) ?? Promise.resolve({ options }));
-			const result = await runNetwork("model", () => {
-				iterator ??= factory(direct ? request.options : compaction?.requestOptions(request.options) ?? request.options)[Symbol.asyncIterator]();
-				return iterator[method]?.(value) ?? (method === "throw" ? Promise.reject(value) : Promise.resolve({
-					done: true,
-					value
-				}));
-			}, direct ? request.network : compaction?.networkOptions(request.network) ?? request.network);
-			return result.done ? result : {
-				...result,
-				value: normalizeTransportEvent(result.value, request.options?.signal)
-			};
+			try {
+				const request = await (prepared ??= (direct ? void 0 : connection?.prepare(options)) ?? Promise.resolve({ options }));
+				if (stage === "prepare") stage = "request";
+				const result = await runNetwork("model", () => {
+					const next = direct ? request.options : compaction?.requestOptions(request.options) ?? request.options;
+					iterator ??= factory({
+						...next,
+						async onPayload(payload, requestModel) {
+							stage = "payload";
+							return next.onPayload?.(payload, requestModel);
+						}
+					})[Symbol.asyncIterator]();
+					return iterator[method]?.(value) ?? (method === "throw" ? Promise.reject(value) : Promise.resolve({
+						done: true,
+						value
+					}));
+				}, direct ? request.network : compaction?.networkOptions(request.network) ?? request.network);
+				if (!result.done) {
+					if (result.value?.type === "error" && !request.options?.signal?.aborted) noteStreamFailure(stage, void 0, source);
+					else if (stage === "payload") stage = "stream";
+				}
+				return result.done ? result : {
+					...result,
+					value: normalizeTransportEvent(result.value, request.options?.signal)
+				};
+			} catch (error) {
+				noteStreamFailure(stage, error, source);
+				throw error;
+			}
 		};
 		return {
 			[Symbol.asyncIterator]() {
@@ -3890,9 +4094,16 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 			throw: (error) => iterator ? step("throw", error) : Promise.reject(error)
 		};
 	};
-	const routed = (method, model, context, options) => {
+	const routed = (method, model, transcript, options) => {
+		const context = understandsSystemMessages(runtimeVersions().piAi) ? transcript : hoistLeadingSystem(transcript);
 		const route = reviewRoute(model, context);
-		const create = () => route === void 0 ? networkIterable((prepared) => provider[method](model, context, prepared), withPreferences(model, options)) : networkIterable((prepared) => provider[method](model, context, prepared), withReview(route, options), true);
+		const source = {
+			method,
+			model,
+			context,
+			options
+		};
+		const create = () => route === void 0 ? networkIterable((prepared) => provider[method](model, context, prepared), withPreferences(model, options), false, source) : networkIterable((prepared) => provider[method](model, context, prepared), withReview(route, options), true, source);
 		return isDshAutoReview(context) ? reviewIterable(create) : create();
 	};
 	return Object.freeze({
@@ -3904,7 +4115,9 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 		getModels,
 		stream: (model, context, options) => routed("stream", model, context, options),
 		streamSimple: (model, context, options) => routed("streamSimple", model, context, options),
-		reviewCounters: () => ({ ...review })
+		reviewCounters: () => ({ ...review }),
+		streamFailure: () => ({ ...streamFailure }),
+		noteAdapterFailure
 	});
 }
 Object.freeze([
@@ -4850,6 +5063,15 @@ function safeRequests(network) {
 	}
 	return result;
 }
+/** pi-ai and DSH's adapter come from the host; a profile can pair an adapter with an older library, so the report names both. */
+function libraryVersions() {
+	const { piAi, adapter } = runtimeVersions();
+	const valid = (value) => typeof value === "string" && /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]{1,32})?$/u.test(value);
+	return {
+		...valid(piAi) ? { piAi } : {},
+		...valid(adapter) ? { adapter } : {}
+	};
+}
 /** Build a support report that deliberately excludes OAuth and account metadata. */
 async function createSubscriptionDiagnostics({ auth, preferences, login = { phase: "idle" }, network, modelCatalog, connection, compaction, review, inspectionOptions, operations, runtimeManagement, storage, tools }) {
 	const collected = {};
@@ -4915,6 +5137,26 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 				"retries"
 			]) : void 0
 		],
+		[
+			"streamFailure",
+			"transport",
+			() => {
+				const value = review?.streamFailure?.();
+				if (!Number.isSafeInteger(value?.count)) return void 0;
+				return {
+					count: value.count,
+					...[
+						"prepare",
+						"request",
+						"payload",
+						"stream"
+					].includes(value.stage) ? { stage: value.stage } : {},
+					...typeof value.frame === "string" && /^[\w.@/-]{1,120}:\d+:\d+$/u.test(value.frame) ? { frame: value.frame } : {},
+					...value.request && typeof value.request === "object" && JSON.stringify(value.request).length <= 12e4 ? { request: value.request } : {},
+					...value.adapter && typeof value.adapter === "object" && JSON.stringify(value.adapter).length <= 12e4 ? { adapter: value.adapter } : {}
+				};
+			}
+		],
 		[
 			"operations",
 			"transport",
@@ -5008,7 +5250,8 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 			node: process.version,
 			platform: process.platform,
 			arch: process.arch,
-			...hostDshVersion() ? { dsh: hostDshVersion() } : {}
+			...hostDshVersion() ? { dsh: hostDshVersion() } : {},
+			...libraryVersions()
 		},
 		account,
 		login,
@@ -5018,6 +5261,7 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 		...collected.websocket ? { websocket: collected.websocket } : {},
 		...collected.compaction ? { compaction: collected.compaction } : {},
 		...collected.review ? { review: collected.review } : {},
+		...collected.streamFailure ? { streamFailure: collected.streamFailure } : {},
 		...catalog && ["unavailable", "online"].includes(catalog.source) && [
 			"idle",
 			"refreshing",
@@ -6437,6 +6681,7 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 }
 //#endregion
 //#region src/index.js
+const z = createRequire(import.meta.resolve("@deepseek-ai/dsh-settings"))("@deepseek-ai/schemastery");
 const name = "codex-subscription";
 const inject = [
 	"llm",
@@ -6745,7 +6990,7 @@ function apply(ctx, config = {}) {
 		auth: adapterAuth,
 		resolveAttachments: () => ctx.get?.("attachments")
 	});
-	ctx.llm.registerAdapter([PROVIDER], compaction.wrapAdapter(adapter));
+	ctx.llm.registerAdapter([PROVIDER], observeAdapter(compaction.wrapAdapter(adapter), provider));
 	const currentAgent = () => ctx.get?.("agents")?.currentInitiator?.();
 	const codexSearch = createCodexSearchProvider({
 		resolvePreferences: () => readCapabilitySettings(settings.get()),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.6.7",
+  "version": "2.6.9",
   "description": "Use ChatGPT and Codex subscriptions in DeepSeek Harness with OAuth, quota, safe resets, web search, images, and Fast mode",
   "type": "module",
   "main": "./lib/index.js",