dsh-codex-subscription 2.5.5 → 2.5.7

package/lib/index.js

@@ -424,6 +424,11 @@ const PREFERENCE_FIELDS = Object.freeze({
 		default: "sse",
 		error: "Invalid connection mode"
 	},
+	reviewModel: {
+		choices: ["session", "official"],
+		default: "session",
+		error: "Invalid review model"
+	},
 	subagentBackend: {
 		choices: ["dsh", "codex"],
 		default: "dsh",
@@ -2044,7 +2049,7 @@ function inheritedOriginalImageRef(session, assetId) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "2.5.5";
+const PACKAGE_VERSION = "2.5.7";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-images.js
@@ -2672,23 +2677,6 @@ function createSketchAgentTool(bridge, attachments, getSessionMessages = () => [
 	});
 }
 //#endregion
-//#region src/sketch-codec-route.js
-function registerSketchCodec(connection) {
-	let source;
-	return connection.fetch.register({
-		path: "/api/codex-subscription/sketch-psd-worker",
-		methods: ["GET"],
-		requestBody: "buffered",
-		async fetch() {
-			source ??= await readFile(new URL("./sketch-psd-worker.js", import.meta.url));
-			return new Response(source, { headers: {
-				"content-type": "text/javascript; charset=utf-8",
-				"cache-control": "no-store"
-			} });
-		}
-	});
-}
-//#endregion
 //#region src/account-vault.js
 const VERSION = 1;
 const DEFAULT_LABEL = "Account 1";
@@ -3600,6 +3588,20 @@ function withInputImageDetail(payload, detail) {
 		input
 	} : payload;
 }
+const DSH_REVIEW_POLICY_PREFIX = "REVIEW_POLICY\nYou are the final authorization reviewer";
+const REVIEW_MODEL_SESSION = "session";
+const REVIEW_RETRIES = 2;
+const TRANSIENT_REVIEW_FAILURE = /stream ended (?:before|without)|\b(?:network|connection|socket)\b|\bECONN[A-Z]+\b|other side closed|premature close|\bterminated\b|WebSocket closed (?:1006|1011|1012|1013)/iu;
+function systemText(context) {
+	if (typeof context?.systemPrompt === "string") return context.systemPrompt;
+	const first = Array.isArray(context?.messages) ? context.messages[0] : void 0;
+	if (first?.role !== "system") return "";
+	return typeof first.content === "string" ? first.content : Array.isArray(first.content) ? first.content.map((part) => part?.text ?? "").join("") : "";
+}
+/** Whether this request is DSH Auto review judging one pending tool call. */
+function isDshAutoReview(context) {
+	return systemText(context).startsWith(DSH_REVIEW_POLICY_PREFIX);
+}
 /**
 * Preserve pi-ai's native Codex OAuth provider while allowing DSH's generic
 * PiAiAdapter to pass the access token resolved by the host credential store.
@@ -3612,7 +3614,7 @@ function withInputImageDetail(payload, detail) {
 * persistence, headers, transport, and model behavior remain owned by the
 * original provider.
 */
-function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, resolveOutputVerbosity = () => OUTPUT_VERBOSITY_DEFAULT, resolveInputImageDetail = () => void 0, resolveContextMode = () => void 0, resolveCustomContextWindow = () => void 0, catalog, connection, compaction, runNetwork = (_area, operation) => operation() } = {}) {
+function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, resolveOutputVerbosity = () => OUTPUT_VERBOSITY_DEFAULT, resolveInputImageDetail = () => void 0, resolveContextMode = () => void 0, resolveCustomContextWindow = () => void 0, resolveReviewModel = () => REVIEW_MODEL_SESSION, catalog, connection, compaction, runNetwork = (_area, operation) => operation() } = {}) {
 	const provider = createOpenAICodexProvider();
 	const requestToken = Object.freeze({
 		name: "DSH-managed Codex OAuth request token",
@@ -3680,18 +3682,77 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 			contextWindow: requested
 		};
 	});
-	const networkIterable = (factory, options) => {
+	const review = {
+		requests: 0,
+		routed: 0,
+		sessionModel: 0,
+		retries: 0
+	};
+	const reviewRoute = (model, context) => {
+		if (resolveReviewModel() !== "official" || !isDshAutoReview(context)) return void 0;
+		review.requests += 1;
+		const route = catalog?.reviewModel?.(model?.id);
+		if (route === void 0) review.sessionModel += 1;
+		else review.routed += 1;
+		return route;
+	};
+	const withReview = (route, options = {}) => {
+		const { temperature: _temperature, onPayload, ...rest } = options;
+		return {
+			...rest,
+			async onPayload(payload, requestModel) {
+				const { temperature: _dropped, service_tier: _tier, text: _text, ...accepted } = await onPayload?.(payload, requestModel) ?? payload;
+				return {
+					...accepted,
+					model: route.id,
+					...route.effort === void 0 ? {} : { reasoning: {
+						...accepted.reasoning ?? {},
+						effort: route.effort
+					} }
+				};
+			}
+		};
+	};
+	const reviewIterable = (create) => {
+		let replay;
+		const run = async function* () {
+			for (let attempt = 0;; attempt += 1) {
+				const events = [];
+				let failure;
+				let thrown;
+				try {
+					for await (const event of create()) {
+						events.push(event);
+						if (event?.type === "error") failure = event.error?.errorMessage;
+					}
+				} catch (error) {
+					thrown = error;
+					failure = error?.message;
+				}
+				if (failure !== void 0 && attempt < REVIEW_RETRIES && TRANSIENT_REVIEW_FAILURE.test(failure)) {
+					review.retries += 1;
+					continue;
+				}
+				if (thrown !== void 0 && events.length === 0) throw thrown;
+				yield* events;
+				if (thrown !== void 0) throw thrown;
+				return;
+			}
+		};
+		return { [Symbol.asyncIterator]: () => replay ??= run() };
+	};
+	const networkIterable = (factory, options, direct = false) => {
 		let iterator;
 		let prepared;
 		const step = async (method, value) => {
-			const request = await (prepared ??= connection?.prepare(options) ?? Promise.resolve({ options }));
+			const request = await (prepared ??= (direct ? void 0 : connection?.prepare(options)) ?? Promise.resolve({ options }));
 			const result = await runNetwork("model", () => {
-				iterator ??= factory(compaction?.requestOptions(request.options) ?? request.options)[Symbol.asyncIterator]();
+				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
 				}));
-			}, compaction?.networkOptions(request.network) ?? request.network);
+			}, direct ? request.network : compaction?.networkOptions(request.network) ?? request.network);
 			return result.done ? result : {
 				...result,
 				value: normalizeTransportEvent(result.value, request.options?.signal)
@@ -3709,6 +3770,11 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 			throw: (error) => iterator ? step("throw", error) : Promise.reject(error)
 		};
 	};
+	const routed = (method, model, context, options) => {
+		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);
+		return isDshAutoReview(context) ? reviewIterable(create) : create();
+	};
 	return Object.freeze({
 		...provider,
 		auth: Object.freeze({
@@ -3716,8 +3782,9 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 			apiKey: requestToken
 		}),
 		getModels,
-		stream: (model, context, options) => networkIterable((prepared) => provider.stream(model, context, prepared), withPreferences(model, options)),
-		streamSimple: (model, context, options) => networkIterable((prepared) => provider.streamSimple(model, context, prepared), withPreferences(model, options))
+		stream: (model, context, options) => routed("stream", model, context, options),
+		streamSimple: (model, context, options) => routed("streamSimple", model, context, options),
+		reviewCounters: () => ({ ...review })
 	});
 }
 Object.freeze([
@@ -3844,6 +3911,23 @@ function visibleModel(value, displayNames, now) {
 		supportsUltrafast: speedTierIds(value).includes("ultrafast")
 	};
 }
+/**
+* Mirror Codex's reviewer selection: a parent model's override, else the
+* default reviewer, used only when the account catalog lists that slug (any
+* visibility), with low reasoning when the reviewer supports it.
+*/
+function officialReviewModel(value, parentId) {
+	if (!record$3(value) || !Array.isArray(value.models)) return void 0;
+	const parent = value.models.find((model) => record$3(model) && model.slug === parentId);
+	const id = nonEmpty$1(parent?.auto_review_model_override) ?? "codex-auto-review";
+	const preset = value.models.find((model) => record$3(model) && model.slug === id);
+	if (preset === void 0) return void 0;
+	const effort = (Array.isArray(preset.supported_reasoning_levels) ? preset.supported_reasoning_levels : []).some((level) => (record$3(level) ? level.effort : level) === "low") ? "low" : nonEmpty$1(preset.default_reasoning_level);
+	return {
+		id,
+		...effort === void 0 ? {} : { effort }
+	};
+}
 function parseOfficialModelCatalog(value, now = Date.now()) {
 	if (!record$3(value) || !Array.isArray(value.models)) throw new Error("Codex returned a malformed model catalog");
 	const displayNames = /* @__PURE__ */ new Map();
@@ -3985,6 +4069,7 @@ function createOfficialModelCatalog(options = {}) {
 		refresh,
 		getModels: () => models ?? [],
 		metadata: (modelId) => metadata.get(modelId),
+		reviewModel: (parentId) => officialReviewModel(rawCatalog, parentId),
 		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) => ({
 			model: model.id,
@@ -4644,7 +4729,7 @@ function safeRequests(network) {
 	return result;
 }
 /** Build a support report that deliberately excludes OAuth and account metadata. */
-async function createSubscriptionDiagnostics({ auth, preferences, login = { phase: "idle" }, network, modelCatalog, connection, compaction, inspectionOptions, operations, runtimeManagement, storage, tools }) {
+async function createSubscriptionDiagnostics({ auth, preferences, login = { phase: "idle" }, network, modelCatalog, connection, compaction, review, inspectionOptions, operations, runtimeManagement, storage, tools }) {
 	const collected = {};
 	const checks = await collectChecks([
 		[
@@ -4698,6 +4783,16 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 				"checkpointsReused"
 			]) : void 0
 		],
+		[
+			"review",
+			"transport",
+			() => typeof review?.reviewCounters === "function" ? safeCounters({ snapshot: () => review.reviewCounters() }, [
+				"requests",
+				"routed",
+				"sessionModel",
+				"retries"
+			]) : void 0
+		],
 		[
 			"operations",
 			"transport",
@@ -4800,6 +4895,7 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 		...collected.operations ? { operations: collected.operations } : {},
 		...collected.websocket ? { websocket: collected.websocket } : {},
 		...collected.compaction ? { compaction: collected.compaction } : {},
+		...collected.review ? { review: collected.review } : {},
 		...catalog && ["unavailable", "online"].includes(catalog.source) && [
 			"idle",
 			"refreshing",
@@ -6295,6 +6391,7 @@ function apply(ctx, config = {}) {
 			if (field === void 0) return void 0;
 			return normalizeCustomContextWindow(settings.get()[field] ?? CUSTOM_CONTEXT_MODEL_DEFAULTS[modelKey], CUSTOM_CONTEXT_MODEL_CAPS[modelKey]);
 		},
+		resolveReviewModel: () => settings.get().reviewModel,
 		catalog: modelCatalog,
 		runNetwork: network.run
 	});
@@ -6306,6 +6403,7 @@ function apply(ctx, config = {}) {
 				[AUTO_QUOTA_RETRY_FIELD]: normalizeAutoQuotaRetry(settings.get()[AUTO_QUOTA_RETRY_FIELD]),
 				compactionMode: settings.get().compactionMode ?? "dsh",
 				connectionMode: settings.get().connectionMode ?? "sse",
+				reviewModel: settings.get().reviewModel ?? "session",
 				subagentBackend: settings.get().subagentBackend ?? "dsh",
 				subagentBackendAvailable: subagentBackend !== void 0,
 				subagentRuntimeInstalled: inspectSubagentRuntime().installed,
@@ -6593,6 +6691,7 @@ function apply(ctx, config = {}) {
 			modelCatalog,
 			connection,
 			compaction,
+			review: provider,
 			operations: diagnosticOperations,
 			runtimeManagement,
 			storage: () => usageReader.storage(),
@@ -6608,20 +6707,7 @@ function apply(ctx, config = {}) {
 	ctx.effect(() => {
 		modelCatalog.refresh().catch((error) => ctx.logger?.debug?.("could not refresh Codex model catalog: %s", error.message));
 	}, "codex-subscription: official model catalog");
-	ctx.inject(["connection"], (connectionContext) => connectionContext.effect(() => {
-		const transport = registerSubscriptionTransport(connectionContext.connection, handler);
-		let codec;
-		try {
-			codec = registerSketchCodec(connectionContext.connection);
-		} catch (error) {
-			transport();
-			throw error;
-		}
-		return () => {
-			codec();
-			transport();
-		};
-	}, "codex-subscription: DSH-trusted account RPC"));
+	ctx.inject(["connection"], (connectionContext) => connectionContext.effect(() => registerSubscriptionTransport(connectionContext.connection, handler), "codex-subscription: DSH-trusted account RPC"));
 }
 //#endregion
 export { CODEX_IMAGE_GENERATION_URL, CODEX_IMAGE_TOOL_NAME, CODEX_RESET_CONSUME_URL, CODEX_RESET_CREDITS_URL, CODEX_USAGE_URL, CodexLoginCoordinator, Config, DEFAULT_MODEL_PROVIDER, DshOAuthCredentialStore, apply, assertCodexAuthUrl, commandForCodexAuthUrl, createCodexAuthService, createCodexImageTool, createCodexResetCreditService, createCodexRpcHandler, createCodexUsageReader, createDefaultModelController, createSearchProviderSwitcher, createSubscriptionDiagnostics, createSubscriptionRpcHandler, decodeCodexPng, inject, name, normalizeContextMode, normalizeCustomContextWindow, openCodexAuthUrl, parseCodexUsage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "2.5.5",
+  "version": "2.5.7",
   "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",
@@ -121,7 +121,6 @@
     "@deepseek-ai/schemastery": "3.18.4",
     "@earendil-works/pi-ai": "0.85.1",
     "@heroicons/react": "2.2.0",
-    "ag-psd": "31.0.2",
     "fake-indexeddb": "6.2.5",
     "react": "18.3.1",
     "react-dom": "18.3.1",