dsh-codex-subscription 2.1.2 → 2.1.3

package/lib/index.js

@@ -1,3 +1,4 @@
+import { createRequire } from "node:module";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { closeOpenAICodexWebSocketSessions, resetOpenAICodexWebSocketDebugStats } from "@earendil-works/pi-ai/api/openai-codex-responses";
 import { execFile, spawn } from "node:child_process";
@@ -9,6 +10,9 @@ import { HttpsProxyAgent } from "https-proxy-agent";
 import WebSocket from "ws";
 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 { defineTool } from "@deepseek-ai/dsh-tools";
 import * as dshCredentials from "@deepseek-ai/dsh-credentials";
 import { dshHomePath, resolveDshHome } from "@deepseek-ai/dsh-home-paths";
@@ -18,8 +22,6 @@ 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";
-import { constants } from "node:fs";
-import { dirname, join, resolve } from "node:path";
 //#region src/image-models.js
 const DEFAULT_IMAGE_MODEL = "gpt-image-2";
 const IMAGE_MODELS = Object.freeze({
@@ -875,6 +877,10 @@ const RPC_ENDPOINTS = Object.freeze([
 	"preferences/status",
 	"preferences/models",
 	"preferences/update",
+	"runtime/status",
+	"runtime/install",
+	"runtime/remove",
+	"runtime/cancel",
 	"reset-credit/inspect",
 	"reset-credit/prepare",
 	"reset-credit/consume",
@@ -1048,6 +1054,45 @@ function authenticatedSubagentChild(child, { Transport, getTokens, thread, signa
 	} });
 }
 //#endregion
+//#region src/subagent-runtime.js
+const SUBAGENT_RUNTIME_PACKAGE = "@deepseek-ai/dsh-subagent-codex";
+const SUBAGENT_RUNTIME_VERSION = "0.1.5-rc.2";
+const require = createRequire(import.meta.url);
+const execute = promisify(execFile);
+function inspectSubagentRuntime(resolve = require.resolve) {
+	try {
+		const manifestPath = resolve(`${SUBAGENT_RUNTIME_PACKAGE}/package.json`);
+		if (JSON.parse(readFileSync(manifestPath, "utf8")).version !== "0.1.5-rc.2") return { installed: false };
+		return { installed: true };
+	} catch {
+		return { installed: false };
+	}
+}
+async function loadSubagentRuntime({ resolve: resolve$1 = require.resolve, run = execute, importModule = (url) => import(url) } = {}) {
+	if (!inspectSubagentRuntime(resolve$1).installed) throw new Error("Codex subtask runtime is not prepared");
+	const entry = resolve$1(SUBAGENT_RUNTIME_PACKAGE);
+	const providerRequire = createRequire(entry);
+	const codexManifestPath = providerRequire.resolve("@openai/codex/package.json");
+	const codex = JSON.parse(readFileSync(codexManifestPath, "utf8"));
+	if (codex.version !== "0.153.4" || typeof codex.bin?.codex !== "string") throw new Error("Codex subtask runtime version is unsupported");
+	const wrapper = resolve(dirname(codexManifestPath), codex.bin.codex);
+	try {
+		const { stdout } = await run(process.execPath, [wrapper, "--version"], {
+			timeout: 1e4,
+			maxBuffer: 4096,
+			windowsHide: true
+		});
+		if (stdout.trim() !== "codex-cli 0.153.4") throw new Error("Unexpected CLI version");
+	} catch {
+		throw new Error("Codex subtask runtime is incomplete; prepare it for this platform");
+	}
+	const [official, { JsonRpcLineTransport: Transport }] = await Promise.all([importModule(pathToFileURL(entry).href), importModule(pathToFileURL(providerRequire.resolve("@deepseek-ai/dsh-sdk-protocol")).href)]);
+	return {
+		official,
+		Transport
+	};
+}
+//#endregion
 //#region src/subagent-backend.js
 const SUBAGENT_PROVIDER = "codex-subscription-subagent";
 const MODES = /* @__PURE__ */ new Set([
@@ -1086,7 +1131,7 @@ function subagentThreadPolicy(parent, policy, requested = {}) {
 	};
 }
 /** Reuse the official DSH process/turn provider; keep only subscription auth here. */
-function createSubscriptionSubagent({ ctx, nativeHome, resolveAuth, store, refresh, loadRuntime }) {
+function createSubscriptionSubagent({ ctx, nativeHome, resolveAuth, store, refresh, loadRuntime, maintenance = () => false }) {
 	let runtime;
 	const load = () => runtime ??= loadRuntime().catch((error) => {
 		runtime = void 0;
@@ -1107,6 +1152,7 @@ function createSubscriptionSubagent({ ctx, nativeHome, resolveAuth, store, refre
 			inheritsParentContext: false,
 			async start(request) {
 				if (disposed) throw new Error("Codex subagent is unavailable");
+				if (maintenance()) throw new Error("Codex subtask component is being changed; restart DSH after completion");
 				const controller = new AbortController();
 				active.add(controller);
 				const signal = AbortSignal.any([request.signal, controller.signal]);
@@ -1178,7 +1224,11 @@ function createSubscriptionSubagent({ ctx, nativeHome, resolveAuth, store, refre
 				}
 			}
 		},
-		prepare: load,
+		activeCount: () => active.size,
+		prepare: () => {
+			if (maintenance()) return Promise.reject(/* @__PURE__ */ new Error("Restart DSH after changing the Codex subtask component"));
+			return load();
+		},
 		dispose() {
 			disposed = true;
 			for (const controller of active) controller.abort();
@@ -1252,11 +1302,104 @@ function createSubagentBackendSwitcher({ entries, prepare, persist }) {
 		}
 	};
 }
-async function loadSubagentRuntime() {
-	const [official, { JsonRpcLineTransport: Transport }] = await Promise.all([import("@deepseek-ai/dsh-subagent-codex"), import("@deepseek-ai/dsh-sdk-protocol")]);
+//#endregion
+//#region src/runtime-management.js
+function createRuntimeManagement({ manager, inspect, active, selectDsh }) {
+	let operation;
+	let state = {
+		phase: "idle",
+		restartRequired: false
+	};
+	const supported = (value) => [
+		"listBundles",
+		"installBundle",
+		"removeBundle",
+		"cancelInstall"
+	].every((key) => typeof value?.[key] === "function");
+	const status = async () => {
+		const host = manager();
+		let bundle;
+		let available = supported(host);
+		try {
+			if (available) bundle = (await host.listBundles()).find((value) => value.name === SUBAGENT_RUNTIME_PACKAGE);
+		} catch {
+			available = false;
+		}
+		return {
+			...state,
+			available,
+			installed: inspect().installed,
+			removable: available && bundle?.installed === true && !bundle.readOnlyReason,
+			active: active()
+		};
+	};
+	const start = async (action) => {
+		if (!["install", "remove"].includes(action)) throw Error("invalid-action");
+		if (operation) throw Error("busy");
+		if (state.restartRequired) throw Error("restart-required");
+		if (active() > 0) throw Error("active-tasks");
+		const host = manager();
+		if (!supported(host)) throw Error("unavailable");
+		const requestId = randomUUID();
+		const current = {
+			action,
+			requestId,
+			host
+		};
+		operation = current;
+		state = {
+			phase: action === "install" ? "installing" : "removing",
+			restartRequired: false
+		};
+		current.done = (async () => {
+			try {
+				if (action === "remove") {
+					const bundle = (await host.listBundles()).find((value) => value.name === SUBAGENT_RUNTIME_PACKAGE);
+					if (!bundle?.installed || bundle.readOnlyReason) throw Error("not-removable");
+					await selectDsh();
+				}
+				const result = action === "install" ? await host.installBundle(`${SUBAGENT_RUNTIME_PACKAGE}@${SUBAGENT_RUNTIME_VERSION}`, {
+					enabled: false,
+					requestId
+				}) : await host.removeBundle(SUBAGENT_RUNTIME_PACKAGE);
+				if (result.application === "cancelled") state = {
+					phase: "cancelled",
+					restartRequired: false
+				};
+				else if (["applied", "restart-required"].includes(result.application)) state = {
+					phase: "done",
+					restartRequired: true
+				};
+				else state = {
+					phase: "failed",
+					restartRequired: false,
+					error: result.packageResult?.kind ?? result.error?.code ?? "operation-error"
+				};
+			} catch (error) {
+				state = {
+					phase: "failed",
+					restartRequired: false,
+					error: error.message === "not-removable" ? "not-removable" : "operation-error"
+				};
+			} finally {
+				operation = void 0;
+			}
+		})();
+		return status();
+	};
 	return {
-		official,
-		Transport
+		status,
+		start,
+		blocked: () => operation !== void 0 || state.restartRequired,
+		progress(value) {
+			if (operation?.action === "install" && value.requestId === operation.requestId && value.phase === "applying") state.phase = "applying";
+		},
+		async cancel() {
+			const current = operation;
+			if (current?.action !== "install") return status();
+			if ((await current.host.cancelInstall(current.requestId)).status === "cancelled") await current.done;
+			return status();
+		}
 	};
 }
 //#endregion
@@ -2644,7 +2787,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.2";
+const PACKAGE_VERSION = "2.1.3";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/model-catalog.js
@@ -2689,7 +2832,8 @@ function unsupportedCapabilities(value) {
 function visibleModel(value) {
 	if (!record$4(value)) return void 0;
 	const id = nonEmpty$2(value.slug);
-	if (id === void 0 || value.visibility !== "list") return void 0;
+	const reserve = id === "gpt-reserve" && ["list", "hide"].includes(value.visibility);
+	if (id === void 0 || value.visibility !== "list" && !reserve) return void 0;
 	const supported = Array.isArray(value.supported_reasoning_levels) ? value.supported_reasoning_levels : [];
 	const input = Array.isArray(value.input_modalities) ? value.input_modalities.filter((item) => ["text", "image"].includes(item)) : ["text", "image"];
 	const unsupported = unsupportedCapabilities({
@@ -2699,7 +2843,7 @@ function visibleModel(value) {
 	return {
 		...Object.keys(unsupported).length ? { unsupported } : {},
 		id,
-		name: nonEmpty$2(value.display_name) ?? id,
+		name: reserve ? "GPT-Reserve (Experimental)" : nonEmpty$2(value.display_name) ?? id,
 		description: nonEmpty$2(value.description),
 		priority: Number.isFinite(value.priority) ? value.priority : 0,
 		input: input.length > 0 ? input : ["text"],
@@ -2719,7 +2863,7 @@ function visibleModel(value) {
 function parseOfficialModelCatalog(value) {
 	if (!record$4(value) || !Array.isArray(value.models)) throw new Error("Codex returned a malformed model catalog");
 	const seen = /* @__PURE__ */ new Set();
-	return value.models.map(visibleModel).filter((model) => model !== void 0 && !seen.has(model.id) && seen.add(model.id)).sort((left, right) => right.priority - left.priority);
+	return value.models.map(visibleModel).filter((model) => model !== void 0 && !seen.has(model.id) && seen.add(model.id)).sort((left, right) => Number(left.id === "gpt-reserve") - Number(right.id === "gpt-reserve") || right.priority - left.priority);
 }
 function mergeModel(baseModels, remote) {
 	const base = baseModels.find((model) => model.id === remote.id) ?? baseModels.find((model) => model.id !== "gpt-5.3-codex-spark") ?? baseModels[0];
@@ -2838,7 +2982,7 @@ function createOfficialModelCatalog(options = {}) {
 	};
 	return Object.freeze({
 		refresh,
-		getModels: (fallback) => models ?? fallback,
+		getModels: (fallback) => models ?? fallback.filter((model) => model.id !== "gpt-5.3-codex-spark"),
 		metadata: (modelId) => metadata.get(modelId),
 		revision: () => revision,
 		capabilityGaps: () => [...metadata.values()].filter((model) => model.unsupported && /^[a-z][a-z0-9._-]{0,79}$/u.test(model.id)).slice(0, 20).map((model) => ({
@@ -4693,8 +4837,31 @@ const publicError = (code, message) => ({
 		details: { issues: [] }
 	}
 });
-function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditService, preferences, diagnosticsReader, modelCatalog, originalImages, resolveInheritedOriginal }) {
+function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditService, preferences, runtimeManagement, diagnosticsReader, modelCatalog, originalImages, resolveInheritedOriginal, closeConnections }) {
 	return async (endpoint, payload, signal) => {
+		if ([
+			"runtime/status",
+			"runtime/install",
+			"runtime/remove",
+			"runtime/cancel"
+		].includes(endpoint)) try {
+			signal.throwIfAborted();
+			if (!runtimeManagement) return publicError("unavailable", "Runtime management is unavailable");
+			const action = endpoint.split("/")[1];
+			return {
+				ok: true,
+				value: action === "status" ? await runtimeManagement.status() : action === "cancel" ? await runtimeManagement.cancel() : await runtimeManagement.start(action)
+			};
+		} catch (error) {
+			if (signal.aborted) throw error;
+			const code = [
+				"busy",
+				"active-tasks",
+				"restart-required",
+				"unavailable"
+			].includes(error.message) ? error.message : "operation-error";
+			return publicError(code, code);
+		}
 		if (endpoint === "image/original/chunk") try {
 			signal.throwIfAborted();
 			if (typeof payload?.sessionId !== "string" || payload.sessionId.length === 0 || payload.sessionId.length > 512 || typeof payload?.assetId !== "string" || !ORIGINAL_IMAGE_ID_PATTERN.test(payload.assetId) || !Number.isSafeInteger(payload?.offset) || payload.offset < 0 || payload.offset % 4194304 !== 0) return publicError("invalid-input", "Invalid original image request");
@@ -4813,6 +4980,11 @@ function createSubscriptionRpcHandler({ authHandler, usageReader, resetCreditSer
 			return publicError("internal", message);
 		}
 		const result = await authHandler(endpoint, payload, signal);
+		if (result.ok === true && [
+			"logout",
+			"account/select",
+			"account/remove"
+		].includes(endpoint)) closeConnections?.();
 		if (endpoint === "account/remove" && result.ok === true && typeof payload?.id === "string") await usageReader.clearScope(payload.id);
 		if (endpoint === "logout" && result.ok === true) {
 			await usageReader.clear();
@@ -4910,6 +5082,16 @@ function apply(ctx) {
 	const baseProvider = createOpenAICodexProvider();
 	let resolveAuth = async () => void 0;
 	let subagentBackend;
+	const runtimeManagement = createRuntimeManagement({
+		manager: () => ctx.get?.("pluginManager"),
+		inspect: inspectSubagentRuntime,
+		active: () => subagentBackend?.activeCount() ?? 0,
+		selectDsh: async () => {
+			if (subagentBackend) await subagentBackend.select("dsh");
+			else await settings.update({ subagentBackend: "dsh" });
+		}
+	});
+	ctx.effect(() => ctx.on?.("plugin-manager/install-state", (value) => runtimeManagement.progress(value)));
 	const modelCatalog = createOfficialModelCatalog({
 		getAuth: (options) => resolveAuth(options),
 		readCredential: (options) => store.read(PROVIDER, options),
@@ -4948,6 +5130,7 @@ function apply(ctx) {
 			connectionMode: settings.get().connectionMode ?? "sse",
 			subagentBackend: settings.get().subagentBackend ?? "dsh",
 			subagentBackendAvailable: subagentBackend !== void 0,
+			subagentRuntimeInstalled: inspectSubagentRuntime().installed,
 			...readCapabilitySettings(settings.get()),
 			[QUICK_QUOTA_MODE_FIELD]: normalizeQuickQuotaMode(settings.get()[QUICK_QUOTA_MODE_FIELD], settings.get()[LEGACY_QUICK_QUOTA_FIELD]),
 			[SEARCH_PROVIDER_FIELD]: settings.get()[SEARCH_PROVIDER_FIELD],
@@ -5014,7 +5197,8 @@ function apply(ctx) {
 			resolveAuth,
 			store,
 			refresh: (credential) => network.run("oauth", () => baseProvider.auth.oauth.refresh(credential)),
-			loadRuntime: loadSubagentRuntime
+			loadRuntime: loadSubagentRuntime,
+			maintenance: runtimeManagement.blocked
 		});
 		scoped.subagents.registerProvider(instance.provider);
 		const switcher = createSubagentBackendSwitcher({
@@ -5035,7 +5219,10 @@ function apply(ctx) {
 				throw error;
 			}
 		};
-		subagentBackend = { select };
+		subagentBackend = {
+			select,
+			activeCount: instance.activeCount
+		};
 		const sync = (value) => {
 			const mode = value.subagentBackend ?? "dsh";
 			if (mode !== requested) select(mode).catch(() => scoped.logger.warn("Could not switch the subscription subagent backend"));
@@ -5180,6 +5367,7 @@ function apply(ctx) {
 		usageReader,
 		resetCreditService,
 		preferences,
+		runtimeManagement,
 		diagnosticsReader: () => createSubscriptionDiagnostics({
 			auth,
 			preferences,
@@ -5188,6 +5376,7 @@ function apply(ctx) {
 			modelCatalog
 		}),
 		modelCatalog,
+		closeConnections: () => connection.dispose(),
 		originalImages,
 		resolveInheritedOriginal: (sessionId, assetId) => inheritedOriginalImageRef(ctx.get?.("sessions")?.get?.(sessionId), assetId)
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "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",
@@ -74,45 +74,46 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "4.0.1 || 4.0.2",
-    "@deepseek-ai/dsh-api-remotes": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-tool": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-llm": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-settings": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-tools": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
-    "@deepseek-ai/dsh-web": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.6-alpha.1",
+    "@deepseek-ai/dsh-api-remotes": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-tool": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-credentials": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-llm": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-settings": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-tools": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
+    "@deepseek-ai/dsh-web": "0.1.2-rc.1 || 0.1.5-alpha.1 || 0.1.5-alpha.2 || 0.1.5-rc.1 || 0.1.5-rc.2 || 0.1.6-alpha.1 || 0.1.6-alpha.2",
     "@deepseek-ai/schemastery": "3.18.1 || ^3.18.2",
     "@earendil-works/pi-ai": "0.82.1 || 0.85.1",
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "@deepseek-ai/dsh-subagent-codex": "0.1.5-rc.2"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-api-remotes": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-connection": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-tool": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-credentials": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-invariants": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.5-rc.1",
-    "@deepseek-ai/dsh-web": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-api-remotes": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-model-selection": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-tool": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-credentials": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-invariants": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-tools": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-web": "0.1.5-rc.2",
     "@deepseek-ai/schemastery": "3.18.2",
     "@earendil-works/pi-ai": "0.82.1",
     "@heroicons/react": "2.2.0",
@@ -120,16 +121,18 @@
     "fake-indexeddb": "6.2.5",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "tsdown": "0.22.2"
+    "tsdown": "0.22.2",
+    "@deepseek-ai/dsh-subagent-codex": "0.1.5-rc.2"
   },
   "dependencies": {
     "@deepseek-ai/dsh-home-paths": "0.1.1-rc.2",
     "https-proxy-agent": "7.0.6",
     "ws": "8.21.3"
   },
-  "optionalDependencies": {
-    "@deepseek-ai/dsh-sdk-protocol": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-subagent-codex": "0.1.5-rc.2"
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-subagent-codex": {
+      "optional": true
+    }
   },
   "scripts": {
     "build": "tsdown --config tsdown.config.mjs",