dsh-codex-subscription 2.1.1-beta.2 → 2.1.2

package/README.en.md

@@ -249,7 +249,7 @@ see the [OpenAI Codex Speed documentation](https://learn.chatgpt.com/docs/agent-
 Opt in under **Advanced & diagnostics**. SSE and DSH subtasks remain the defaults:
 
 - **WebSocket** reuses connections and eligible context transfers. Failed handshakes can fall back to SSE; interrupted responses surface an error without automatic replay. Applies to the next request, does not expand context limits, and is not guaranteed to be faster.
-- **Codex independent subtasks** reuse your subscription login and the official DSH Codex runtime, without a separate login or CLI setup. They follow the current subscription model and workspace permissions; other model sessions use Luna low. Shared-context subtasks remain with DSH.
+- **Codex independent subtasks** reuse your subscription login and the official DSH Codex runtime, without a separate login or CLI setup. They inherit the current subscription model and workspace permissions by default. Enable DSH subtask model selection, configure allowed models and start a new session to specify the child model and reasoning effort in chat. Non-subscription sessions must explicitly select a subscription model. Shared-context subtasks remain with DSH.
 
 ## Update and uninstall
 

package/README.md

@@ -248,7 +248,7 @@ ChatGPT 返回可用重置卡时，设置页会把每张卡分别显示为紧凑
 在 **高级与诊断** 中按需开启，默认仍使用 SSE 和 DSH 子任务：
 
 - **WebSocket**：复用连接和可复用的上下文传输；握手失败可回退 SSE，已开始的响应中断会报错，不自动重放。下次请求生效，不增加模型上下文容量，也不保证更快。
-- **Codex 独立子任务**：复用订阅登录和官方 DSH Codex 运行时，无需另行登录或配置 CLI。跟随当前订阅模型及工作区权限；其他模型会话使用 Luna low。共享上下文的子任务仍交给 DSH。
+- **Codex 独立子任务**：复用订阅登录和官方 DSH Codex 运行时，无需另行登录或配置 CLI。默认继承当前订阅模型及工作区权限。开启 DSH 子任务模型选择、配置允许模型并新建会话后，可在聊天中指定子任务模型与推理档位；非订阅会话需明确选择订阅模型。共享上下文的子任务仍交给 DSH。
 
 ## 更新与卸载
 

package/lib/client.js

@@ -4472,7 +4472,7 @@ window.__ModuleLoader__.load({
 			subagentBackend_codex: "Codex",
 			connectionTitle: "连接方式",
 			connectionHint: "默认 SSE。WebSocket 实验性复用连接与上下文传输；连接失败可回退 SSE。下次请求生效，不扩大上下文容量。",
-			subagentBackendHint: "Codex 复用订阅登录，跟随当前订阅模型和工作区权限；其他模型会话使用 Luna low。共享上下文子任务仍用 DSH。",
+			subagentBackendHint: "Codex 复用订阅登录和工作区权限；默认继承当前订阅模型。开启 DSH 子任务模型选择并新建会话后，可在聊天中指定允许的订阅模型与推理档位；非订阅会话需指定。共享上下文子任务仍用 DSH。",
 			subagentBackendUnavailable: "当前宿主缺少子代理服务，请更新 DSH。",
 			sketchRecovered: "已恢复未保存草稿",
 			sketchRecoveryFailed: "恢复检查点保存失败，请手动保存或导出草稿。",
@@ -4900,7 +4900,7 @@ window.__ModuleLoader__.load({
 			subagentBackend_codex: "Codex",
 			connectionTitle: "Connection",
 			connectionHint: "SSE by default. Experimental WebSocket reuses connections and context transfers and can fall back to SSE on connection failure. Applies to the next request; context limits stay the same.",
-			subagentBackendHint: "Codex uses your subscription login, current subscription model and workspace permissions; other model sessions use Luna low. Shared-context subtasks stay in DSH.",
+			subagentBackendHint: "Codex reuses subscription login and workspace permissions, inheriting the current subscription model by default. Enable DSH subtask model selection and start a new session to request an allowed subscription model and reasoning effort in chat; other model sessions require an explicit selection. Shared-context subtasks stay in DSH.",
 			subagentBackendUnavailable: "Subagent services are unavailable. Update DSH to use this option.",
 			sketchRecovered: "Unsaved sketch recovered",
 			sketchRecoveryFailed: "Recovery checkpoint failed. Save or export your draft.",
@@ -7146,7 +7146,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "2.1.1-beta.2";
+		const PACKAGE_VERSION = "2.1.2";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {

package/lib/index.js

@@ -468,6 +468,19 @@ function bodyBytes(body) {
 	if (body instanceof Uint8Array) return Buffer.from(body);
 	throw new TypeError("Unsupported Codex OAuth request body");
 }
+function transportError(error, signal) {
+	if (signal?.aborted || error?.name === "AbortError" || error?.code === "ABORT_ERR") return error;
+	if (!/^(?:ECONNRESET|ECONNREFUSED|EPIPE|ETIMEDOUT|ENETUNREACH|EHOSTUNREACH|EAI_AGAIN|ERR_STREAM_PREMATURE_CLOSE)$/.test(error?.code ?? "")) return error;
+	return Object.assign(new Error(`Network transport failure (${error.code}): ${error.message}`, { cause: error }), { code: error.code });
+}
+function transportResponseBody(response, signal) {
+	const body = new PassThrough();
+	response.on("error", (error) => body.destroy(transportError(error, signal)));
+	body.on("close", () => response.destroy());
+	const stream = Readable.toWeb(body);
+	response.pipe(body);
+	return stream;
+}
 function fetchThroughProxy(input, init, proxyUrl) {
 	const target = new URL(typeof input === "string" || input instanceof URL ? input : input.url);
 	const body = bodyBytes(init?.body);
@@ -489,13 +502,14 @@ function fetchThroughProxy(input, init, proxyUrl) {
 				205,
 				304
 			].includes(status);
-			resolve(new Response(empty ? null : Readable.toWeb(response), {
+			if (empty) response.resume();
+			resolve(new Response(empty ? null : transportResponseBody(response, init?.signal), {
 				status,
 				statusText: response.statusMessage,
 				headers: responseHeaders
 			}));
 		});
-		request$1.on("error", reject);
+		request$1.on("error", (error) => reject(transportError(error, init?.signal)));
 		if (body) request$1.write(body);
 		request$1.end();
 	});
@@ -1041,16 +1055,34 @@ const MODES = /* @__PURE__ */ new Set([
 	"workspace-write",
 	"danger-full-access"
 ]);
-function subagentThreadPolicy(parent, policy) {
+function subagentThreadPolicy(parent, policy, requested = {}) {
 	if (!MODES.has(policy?.mode)) throw new Error("DSH subagent sandbox policy is unavailable");
 	const selected = parent.session.requestHeader?.()?.config ?? parent.options ?? {};
-	const subscription = selected.provider === "openai-codex" && typeof selected.model === "string";
+	for (const key of Object.keys(requested)) if (![
+		"provider",
+		"model",
+		"reasoningEffort"
+	].includes(key)) throw new Error("Unsupported Codex child option: " + key);
+	if (requested.provider !== void 0 && requested.provider !== "openai-codex") throw new Error("Codex subtasks require the openai-codex provider");
+	const model = requested.model ?? (selected.provider === "openai-codex" ? selected.model : void 0);
+	if (typeof model !== "string" || !model.trim()) throw new Error("Select an openai-codex model for this subtask; the parent model cannot be inherited");
+	const effort = requested.reasoningEffort ?? (requested.model === void 0 ? selected.reasoningEffort : void 0);
+	if (effort !== void 0 && ![
+		"none",
+		"minimal",
+		"low",
+		"medium",
+		"high",
+		"xhigh",
+		"max",
+		"ultra"
+	].includes(effort)) throw new Error("Unsupported Codex reasoning effort");
 	return {
-		model: subscription ? selected.model : "gpt-5.6-luna",
+		model,
 		modelProvider: "openai",
 		approvalPolicy: "never",
 		sandbox: policy.mode,
-		config: { model_reasoning_effort: subscription ? selected.reasoningEffort ?? "low" : "low" }
+		config: effort === void 0 ? {} : { model_reasoning_effort: effort }
 	};
 }
 /** Reuse the official DSH process/turn provider; keep only subscription auth here. */
@@ -1066,7 +1098,7 @@ function createSubscriptionSubagent({ ctx, nativeHome, resolveAuth, store, refre
 		provider: {
 			name: SUBAGENT_PROVIDER,
 			capabilities: {
-				agentOptions: false,
+				agentOptions: true,
 				outputSchema: false,
 				depthLimit: false,
 				toolFilter: false,
@@ -1080,7 +1112,7 @@ function createSubscriptionSubagent({ ctx, nativeHome, resolveAuth, store, refre
 				const signal = AbortSignal.any([request.signal, controller.signal]);
 				let run;
 				try {
-					const thread = subagentThreadPolicy(request.parent, ctx.sandboxPolicy.resolve({ session: request.parent.session }));
+					const thread = subagentThreadPolicy(request.parent, ctx.sandboxPolicy.resolve({ session: request.parent.session }), request.agentOptions);
 					const getTokens = await createSubagentTokens({
 						resolveAuth,
 						store,
@@ -1125,6 +1157,7 @@ function createSubscriptionSubagent({ ctx, nativeHome, resolveAuth, store, refre
 					});
 					run = await delegate.start({
 						...request,
+						agentOptions: void 0,
 						signal
 					});
 					const result = run.result.finally(() => active.delete(controller));
@@ -1162,7 +1195,7 @@ function createSubagentBackendSwitcher({ entries, prepare, persist }) {
 	const convert = (config) => ({
 		...config,
 		provider: SUBAGENT_PROVIDER,
-		modelSelectionSettings: false,
+		modelSelectionSettings: true,
 		backgroundMode: "one-shot",
 		maxDepth: "provider-managed"
 	});
@@ -2476,6 +2509,20 @@ function createCodexRpcHandler(coordinator, options = {}) {
 	};
 }
 //#endregion
+//#region src/transport-failure.js
+function normalizeTransportEvent(event, signal) {
+	if (signal?.aborted || event?.type !== "error" || event.reason !== "error") return event;
+	const message = event.error?.errorMessage;
+	if (typeof message !== "string" || !/^WebSocket closed (?:1006|1011|1012|1013)(?:\s|$)/.test(message)) return event;
+	return {
+		...event,
+		error: {
+			...event.error,
+			errorMessage: `Network transport failure: ${message}`
+		}
+	};
+}
+//#endregion
 //#region src/pi-ai-runtime.js
 const FAST_SERVICE_TIER = "priority";
 /**
@@ -2559,13 +2606,17 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 		let prepared;
 		const step = async (method, value) => {
 			const request = await (prepared ??= connection?.prepare(options) ?? Promise.resolve({ options }));
-			return runNetwork("model", () => {
+			const result = await runNetwork("model", () => {
 				iterator ??= factory(compaction?.requestOptions(request.options) ?? request.options)[Symbol.asyncIterator]();
 				return iterator[method]?.(value) ?? (method === "throw" ? Promise.reject(value) : Promise.resolve({
 					done: true,
 					value
 				}));
 			}, compaction?.networkOptions(request.network) ?? request.network);
+			return result.done ? result : {
+				...result,
+				value: normalizeTransportEvent(result.value, request.options?.signal)
+			};
 		};
 		return {
 			[Symbol.asyncIterator]() {
@@ -2593,7 +2644,7 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 Object.freeze(["0.82.1", "0.85.1"]);
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.1.1-beta.2";
+const PACKAGE_VERSION = "2.1.2";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.1.1-beta.2",
+  "version": "2.1.2",
   "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",