@eddyskywalker/dsh-chatgpt-subscription 0.1.28 → 0.1.30

package/lib/index.js

@@ -1,17 +1,17 @@
 import { CallId, HarnessError, LlmAdapter, LlmError, ProviderRequestId, ReasoningEffortId, attributionHeaders, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
+import { WebError } from "@deepseek-ai/dsh-web";
 import { createUserMessage } from "@deepseek-ai/dsh-llm/message";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
-import { WebError } from "@deepseek-ai/dsh-web";
 import http from "node:http";
+import { execSync, spawn } from "node:child_process";
+import { ProxyAgent, fetch as fetch$1 } from "undici";
 import { settingsNamespace } from "@deepseek-ai/dsh-settings";
 import z from "@deepseek-ai/schemastery";
-import { spawn } from "node:child_process";
 import { constants } from "node:fs";
 import { chmod, lstat, mkdir, open, rename, stat, unlink } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { delegationDepthOf } from "@deepseek-ai/dsh-subagent";
 //#region src/compat.ts
 /**
 * Compatibility constants for the ChatGPT-backed Codex flow. The backend and
@@ -39,6 +39,7 @@ const CODEX_ORIGINATOR = "opencode";
 const CODEX_IMAGE_TOOL_NAME = "codex_image_generate";
 const CODEX_IMAGE_MODEL = "gpt-image-2";
 const CODEX_SEARCH_PROVIDER_ID = "codex-subscription";
+const CODEX_FETCH_PROVIDER_ID = "codex-subscription";
 const QUOTA_MIN_UPSTREAM_INTERVAL_MS = 15e3;
 const OAUTH_AUTHORIZE_URL = `${CHATGPT_OAUTH_ISSUER}/oauth/authorize`;
 const OAUTH_TOKEN_URL = `${CHATGPT_OAUTH_ISSUER}/oauth/token`;
@@ -162,7 +163,8 @@ function listCodexModels(preferences) {
 }
 function resolveCodexModel(model, preferences) {
 	const entry = resolveCodexCatalogEntry(model);
-	const configuredContextWindow = isConfigurableContextModelId(model) ? preferences?.status().contextWindowOverrides[model] : void 0;
+	const status = preferences?.status();
+	const configuredContextWindow = isConfigurableContextModelId(model) ? status?.contextWindowOverrides[model] : void 0;
 	const efforts = reasoningEffortsForModel(model);
 	return {
 		provider: PROVIDER_ID,
@@ -230,6 +232,79 @@ var CodexChatGptAdapter = class extends LlmAdapter {
 	}
 };
 //#endregion
+//#region src/host/codex-fetch.ts
+const DEFAULT_MAX_RESPONSE_BYTES = 2 * 1024 * 1024;
+const DEFAULT_MAX_BODY_CHARS = 1e5;
+function createCodexFetchProvider(options = {}) {
+	const fetchFn = options.fetchFn ?? fetch;
+	const maxResponseBytes = options.maxResponseBytes ?? DEFAULT_MAX_RESPONSE_BYTES;
+	const maxBodyChars = options.maxBodyChars ?? DEFAULT_MAX_BODY_CHARS;
+	return {
+		id: CODEX_FETCH_PROVIDER_ID,
+		available: () => true,
+		async fetch(request, signal) {
+			const targetUrl = request.url.trim();
+			let parsedUrl;
+			try {
+				parsedUrl = new URL(targetUrl);
+			} catch (error) {
+				throw new WebError(`invalid URL: ${targetUrl}`, "WEB_INVALID_URL", { cause: error });
+			}
+			if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") throw new WebError(`unsupported URL scheme "${parsedUrl.protocol}" (only http and https are allowed)`, "WEB_INVALID_URL");
+			let response;
+			try {
+				response = await fetchFn(targetUrl, {
+					method: "GET",
+					headers: {
+						"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+						Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,text/plain;q=0.8,*/*;q=0.5"
+					},
+					redirect: "follow",
+					signal
+				});
+			} catch (error) {
+				if (signal?.aborted) throw new WebError("web fetch aborted", "WEB_ABORTED", { cause: error });
+				throw new WebError(`web fetch failed: ${error instanceof Error ? error.message : String(error)}`, "WEB_PROVIDER_ERROR", { cause: error });
+			}
+			const contentType = response.headers.get("content-type") || "";
+			const mime = contentType.replace(/;.*$/s, "").trim().toLowerCase();
+			const kind = mime === "text/html" || mime === "application/xhtml+xml" ? "html" : "text";
+			let charset = "utf-8";
+			const match = /;\s*charset\s*=\s*"?([^";]+)"?/i.exec(contentType);
+			if (match?.[1]) charset = match[1].trim().toLowerCase();
+			let decoder;
+			try {
+				decoder = new TextDecoder(charset);
+			} catch {
+				decoder = new TextDecoder("utf-8");
+			}
+			let rawBytes;
+			let truncatedByBytes = false;
+			try {
+				const buffer = await response.arrayBuffer();
+				if (buffer.byteLength > maxResponseBytes) {
+					rawBytes = new Uint8Array(buffer.slice(0, maxResponseBytes));
+					truncatedByBytes = true;
+				} else rawBytes = new Uint8Array(buffer);
+			} catch (error) {
+				throw new WebError(`failed to read response body: ${error instanceof Error ? error.message : String(error)}`, "WEB_PROVIDER_ERROR", { cause: error });
+			}
+			const decodedText = decoder.decode(rawBytes);
+			const truncatedByChars = decodedText.length > maxBodyChars;
+			const finalContent = truncatedByChars ? decodedText.slice(0, maxBodyChars) : decodedText;
+			return {
+				url: response.url || targetUrl,
+				statusCode: response.status,
+				body: {
+					kind,
+					content: finalContent
+				},
+				truncated: truncatedByBytes || truncatedByChars
+			};
+		}
+	};
+}
+//#endregion
 //#region src/host/wire-auth.ts
 function codexHeaders(credentials, sessionId) {
 	const dshAgent = attributionHeaders()["user-agent"] ?? "dsh/unknown";
@@ -502,10 +577,7 @@ function sendSearch(fetchFn, credentials, query, model, id, signal) {
 			id,
 			model,
 			input: query,
-			commands: {
-				search_query: [{ q: query }],
-				response_length: "short"
-			},
+			commands: { search_query: [{ q: query }] },
 			settings: {
 				allowed_callers: ["direct"],
 				external_web_access: true
@@ -1075,6 +1147,154 @@ async function oauthErrorIdentifier(response) {
 	return null;
 }
 //#endregion
+//#region src/host/proxy-manager.ts
+const SYSTEM_PROXY_CACHE_TTL_MS = 5e3;
+function normalizeProxyUrl(rawUrl) {
+	const trimmed = rawUrl.trim();
+	if (!trimmed) return "";
+	if (/^https?:\/\//i.test(trimmed) || /^socks5?:\/\//i.test(trimmed)) return trimmed;
+	return `http://${trimmed}`;
+}
+function parseWindowsProxyRegistry(stdout) {
+	const enableMatch = stdout.match(/ProxyEnable\s+REG_DWORD\s+(0x[0-9a-fA-F]+|\d+)/i);
+	if (!enableMatch) return null;
+	if ((enableMatch[1].startsWith("0x") ? parseInt(enableMatch[1], 16) : parseInt(enableMatch[1], 10)) !== 1) return null;
+	const serverMatch = stdout.match(/ProxyServer\s+REG_SZ\s+([^\r\n]+)/i);
+	if (!serverMatch) return null;
+	const rawServer = serverMatch[1].trim();
+	if (!rawServer) return null;
+	if (rawServer.includes("=")) {
+		const pairs = rawServer.split(";");
+		const map = {};
+		for (const pair of pairs) {
+			const [proto, addr] = pair.split("=").map((s) => s.trim());
+			if (proto && addr) map[proto.toLowerCase()] = addr;
+		}
+		const target = map.https || map.http || map.socks;
+		if (target) {
+			if (map.socks && !map.https && !map.http) return normalizeProxyUrl(target.startsWith("socks") ? target : `socks5://${target}`);
+			return normalizeProxyUrl(target);
+		}
+		return null;
+	}
+	return normalizeProxyUrl(rawServer);
+}
+function parseMacOsScutilProxy(stdout) {
+	const httpsEnable = /HTTPSEnable\s*:\s*1/i.test(stdout);
+	const httpEnable = /HTTPEnable\s*:\s*1/i.test(stdout);
+	const socksEnable = /SOCKSEnable\s*:\s*1/i.test(stdout);
+	if (httpsEnable) {
+		const host = stdout.match(/HTTPSProxy\s*:\s*([^\s\r\n]+)/i)?.[1];
+		const port = stdout.match(/HTTPSPort\s*:\s*(\d+)/i)?.[1];
+		if (host && port) return normalizeProxyUrl(`${host}:${port}`);
+	}
+	if (httpEnable) {
+		const host = stdout.match(/HTTPProxy\s*:\s*([^\s\r\n]+)/i)?.[1];
+		const port = stdout.match(/HTTPPort\s*:\s*(\d+)/i)?.[1];
+		if (host && port) return normalizeProxyUrl(`${host}:${port}`);
+	}
+	if (socksEnable) {
+		const host = stdout.match(/SOCKSProxy\s*:\s*([^\s\r\n]+)/i)?.[1];
+		const port = stdout.match(/SOCKSPort\s*:\s*(\d+)/i)?.[1];
+		if (host && port) return normalizeProxyUrl(`socks5://${host}:${port}`);
+	}
+	return null;
+}
+function parseEnvProxy(env = process.env) {
+	const proxy = env.HTTPS_PROXY || env.https_proxy || env.HTTP_PROXY || env.http_proxy || env.ALL_PROXY || env.all_proxy;
+	if (!proxy || !proxy.trim()) return null;
+	return normalizeProxyUrl(proxy);
+}
+function detectSystemProxy(platform = process.platform, env = process.env) {
+	try {
+		if (platform === "win32") {
+			const detected = parseWindowsProxyRegistry(execSync("reg query \"HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\"", {
+				timeout: 1500,
+				encoding: "utf-8",
+				stdio: [
+					"ignore",
+					"pipe",
+					"ignore"
+				]
+			}));
+			if (detected) return detected;
+		} else if (platform === "darwin") {
+			const detected = parseMacOsScutilProxy(execSync("scutil --proxy", {
+				timeout: 1500,
+				encoding: "utf-8",
+				stdio: [
+					"ignore",
+					"pipe",
+					"ignore"
+				]
+			}));
+			if (detected) return detected;
+		}
+	} catch {}
+	return parseEnvProxy(env);
+}
+var ProxyManager = class {
+	getPreferences;
+	baseFetch;
+	systemProxyDetector;
+	logger;
+	cachedSystemProxy = null;
+	lastSystemProxyCheck = 0;
+	agents = /* @__PURE__ */ new Map();
+	constructor(options) {
+		this.getPreferences = options.getPreferences;
+		this.baseFetch = options.baseFetch ?? fetch;
+		this.systemProxyDetector = options.systemProxyDetector ?? (() => detectSystemProxy());
+		this.logger = options.logger;
+	}
+	getSystemProxy(force = false) {
+		const now = Date.now();
+		if (!force && now - this.lastSystemProxyCheck < SYSTEM_PROXY_CACHE_TTL_MS) return this.cachedSystemProxy;
+		this.lastSystemProxyCheck = now;
+		try {
+			this.cachedSystemProxy = this.systemProxyDetector();
+		} catch (error) {
+			this.cachedSystemProxy = null;
+			this.logger?.warn?.(`[dsh-chatgpt-subscription] Failed to detect system proxy: ${error instanceof Error ? error.message : String(error)}`);
+		}
+		return this.cachedSystemProxy;
+	}
+	resolveActiveProxyUrl() {
+		const prefs = this.getPreferences();
+		const mode = prefs.proxyMode ?? "auto";
+		if (mode === "direct") return null;
+		if (mode === "custom") return prefs.customProxyUrl ? normalizeProxyUrl(prefs.customProxyUrl) : null;
+		return this.getSystemProxy();
+	}
+	getOrCreateAgent(proxyUrl) {
+		let agent = this.agents.get(proxyUrl);
+		if (!agent) {
+			agent = new ProxyAgent(proxyUrl);
+			this.agents.set(proxyUrl, agent);
+		}
+		return agent;
+	}
+	createFetch() {
+		return async (input, init) => {
+			const activeProxy = this.resolveActiveProxyUrl();
+			if (!activeProxy) return this.baseFetch(input, init);
+			try {
+				const agent = this.getOrCreateAgent(activeProxy);
+				return await fetch$1(input, {
+					...init,
+					dispatcher: agent
+				});
+			} catch (error) {
+				throw error;
+			}
+		};
+	}
+	dispose() {
+		for (const agent of this.agents.values()) agent.destroy().catch(() => void 0);
+		this.agents.clear();
+	}
+};
+//#endregion
 //#region src/shared/preferences.ts
 const PREFERENCES_NAMESPACE = "dsh-chatgpt-subscription";
 const DEFAULT_PREFERENCES = {
@@ -1083,17 +1303,15 @@ const DEFAULT_PREFERENCES = {
 	outputVerbosity: null,
 	visibleModelIds: [...DEFAULT_VISIBLE_CODEX_MODEL_IDS],
 	searchProvider: "dsh",
-	subagentProvider: "codex-chatgpt",
-	subagentModel: "gpt-5.6-sol",
-	subagentReasoningEffort: "medium",
-	subagentContextWindow: 272e3,
-	subagentMaxDepth: 3,
-	subagentMaxAgents: 8,
 	contextWindowOverrides: {
 		"gpt-5.6-sol": 272e3,
 		"gpt-5.6-terra": 272e3,
 		"gpt-5.6-luna": 272e3
-	}
+	},
+	subagentContextWindow: null,
+	subagentMaxDepth: null,
+	proxyMode: "auto",
+	customProxyUrl: null
 };
 const SEARCH_PROVIDER_CODEX = "codex";
 function isSearchProviderPreference(value) {
@@ -1102,6 +1320,9 @@ function isSearchProviderPreference(value) {
 function isCodexOutputVerbosity(value) {
 	return value === "low" || value === "medium" || value === "high";
 }
+function isProxyMode(value) {
+	return value === "auto" || value === "custom" || value === "direct";
+}
 //#endregion
 //#region src/host/preferences.ts
 function registerPreferenceStore(settings) {
@@ -1116,17 +1337,19 @@ function registerPreferenceStore(settings) {
 		]).default(DEFAULT_PREFERENCES.outputVerbosity),
 		visibleModelIds: z.array(z.string()).default(DEFAULT_PREFERENCES.visibleModelIds),
 		searchProvider: z.union([z.const("dsh"), z.const(SEARCH_PROVIDER_CODEX)]).default(DEFAULT_PREFERENCES.searchProvider),
-		subagentProvider: z.string().default(DEFAULT_PREFERENCES.subagentProvider),
-		subagentModel: z.string().default(DEFAULT_PREFERENCES.subagentModel),
-		subagentReasoningEffort: z.union([z.string(), z.const(null)]).default(DEFAULT_PREFERENCES.subagentReasoningEffort),
-		subagentContextWindow: z.number().step(1).min(1).default(DEFAULT_PREFERENCES.subagentContextWindow),
-		subagentMaxDepth: z.number().step(1).min(0).max(3).default(DEFAULT_PREFERENCES.subagentMaxDepth),
-		subagentMaxAgents: z.number().step(1).min(1).max(Number.MAX_SAFE_INTEGER).default(DEFAULT_PREFERENCES.subagentMaxAgents),
 		contextWindowOverrides: z.object({
 			"gpt-5.6-sol": z.number().step(1).min(1).max(GPT_56_MAX_CONTEXT_WINDOW).default(DEFAULT_PREFERENCES.contextWindowOverrides["gpt-5.6-sol"]),
 			"gpt-5.6-terra": z.number().step(1).min(1).max(GPT_56_MAX_CONTEXT_WINDOW).default(DEFAULT_PREFERENCES.contextWindowOverrides["gpt-5.6-terra"]),
 			"gpt-5.6-luna": z.number().step(1).min(1).max(GPT_56_MAX_CONTEXT_WINDOW).default(DEFAULT_PREFERENCES.contextWindowOverrides["gpt-5.6-luna"])
-		}).default(DEFAULT_PREFERENCES.contextWindowOverrides)
+		}).default(DEFAULT_PREFERENCES.contextWindowOverrides),
+		subagentContextWindow: z.union([z.number().step(1).min(1), z.const(null)]).default(DEFAULT_PREFERENCES.subagentContextWindow),
+		subagentMaxDepth: z.union([z.number().step(1).min(0).max(3), z.const(null)]).default(DEFAULT_PREFERENCES.subagentMaxDepth),
+		proxyMode: z.union([
+			z.const("auto"),
+			z.const("custom"),
+			z.const("direct")
+		]).default(DEFAULT_PREFERENCES.proxyMode),
+		customProxyUrl: z.union([z.string(), z.const(null)]).default(DEFAULT_PREFERENCES.customProxyUrl)
 	})));
 }
 var SettingsPreferenceStore = class {
@@ -1153,16 +1376,21 @@ var SettingsPreferenceStore = class {
 			if (!isSearchProviderPreference(patch.searchProvider)) throw new PreferenceError("Unsupported search provider preference.");
 			normalized.searchProvider = patch.searchProvider;
 		}
-		if (patch.subagentProvider !== void 0) normalized.subagentProvider = patch.subagentProvider;
-		if (patch.subagentModel !== void 0) normalized.subagentModel = patch.subagentModel;
-		if (patch.subagentReasoningEffort !== void 0) normalized.subagentReasoningEffort = patch.subagentReasoningEffort;
-		if (patch.subagentContextWindow !== void 0) normalized.subagentContextWindow = patch.subagentContextWindow;
-		if (patch.subagentMaxDepth !== void 0) normalized.subagentMaxDepth = patch.subagentMaxDepth;
-		if (patch.subagentMaxAgents !== void 0) normalized.subagentMaxAgents = patch.subagentMaxAgents;
 		if (patch.contextWindowOverrides !== void 0) normalized.contextWindowOverrides = {
 			...this.scope.get().contextWindowOverrides,
 			...patch.contextWindowOverrides
 		};
+		if (patch.subagentContextWindow !== void 0) normalized.subagentContextWindow = patch.subagentContextWindow;
+		if (patch.subagentMaxDepth !== void 0) normalized.subagentMaxDepth = patch.subagentMaxDepth;
+		if (patch.proxyMode !== void 0) {
+			if (!isProxyMode(patch.proxyMode)) throw new PreferenceError("Unsupported proxy mode preference.");
+			normalized.proxyMode = patch.proxyMode;
+		}
+		if (patch.customProxyUrl !== void 0) if (patch.customProxyUrl !== null) {
+			const trimmed = patch.customProxyUrl.trim();
+			if (trimmed.length > 0 && !/^https?:\/\//i.test(trimmed) && !/^socks5?:\/\//i.test(trimmed)) normalized.customProxyUrl = `http://${trimmed}`;
+			else normalized.customProxyUrl = trimmed.length === 0 ? null : trimmed;
+		} else normalized.customProxyUrl = null;
 		await this.scope.update(normalized);
 		return this.status();
 	}
@@ -1223,6 +1451,7 @@ async function buildResponsesPayload(options, attachments, localRawImages = {},
 	const instructionParts = [
 		options.system?.trim(),
 		...options.messages.filter((message) => message.role === "system").map((message) => blocksToText(message.content).trim()),
+		progressExplanationInstruction(options.tools),
 		sandboxToolInstruction(options.tools, sandboxRetryTools),
 		commandToolInstruction(options.tools),
 		runCodeInstruction(options.tools)
@@ -1305,6 +1534,10 @@ async function buildResponsesPayload(options, attachments, localRawImages = {},
 	} : { effort: options.reasoningEffort };
 	return payload;
 }
+function progressExplanationInstruction(tools) {
+	if (!tools?.length) return void 0;
+	return "Progress and tool execution rule: when executing multi-step tasks or invoking tools, output 1-2 concise sentences of progress, intent, or intermediate findings before each tool call. Keep progress text brief, professional, and factual. Only present the comprehensive final answer and summary in the final turn after all tool operations are completed.";
+}
 function runCodeInstruction(tools) {
 	if (!tools?.some((tool) => tool.name === "run_code")) return void 0;
 	return "run_code compatibility rule: its code is parsed as strict JavaScript/TypeScript before execution. Shell commands are nested string data: JavaScript template literals may consume ${...}, backticks, backslashes, and escape sequences before PowerShell, Bash, or POSIX sh sees them. On Windows, avoid embedding PowerShell containing $, ${...}, backslashes, or here-strings in template literals; String.raw does not disable ${...} interpolation. On Linux, prefer ordinary quoted strings or write a script file before invoking bash/sh, especially for commands containing backticks or ${...}. Prefer arrays of ordinary quoted strings joined with \"\\n\", escaping backslashes, or use a file-write tool for large scripts.";
@@ -2379,61 +2612,11 @@ function identityKey(credentials) {
 	return credentials.accountId ?? credentials.email ?? credentials.planType ?? "signed-in";
 }
 //#endregion
-//#region src/host/subagent-context-adapter.ts
-/**
-* A private provider route that delegates streaming to a selected registered
-* provider while exposing a user-selected effective context window to DSH.
-*/
-var SubagentContextAdapter = class SubagentContextAdapter extends LlmAdapter {
-	llm;
-	selection;
-	static provider = "dsh-subagent-model-override";
-	constructor(llm, selection) {
-		super();
-		this.llm = llm;
-		this.selection = selection;
-	}
-	providerInfo() {
-		return {
-			id: SubagentContextAdapter.provider,
-			name: "Subagent model override"
-		};
-	}
-	async listModels() {
-		return [];
-	}
-	async resolveModel(_provider, _model, signal) {
-		const selected = this.selection();
-		return {
-			...await this.llm.resolveModelInfo(selected.provider, selected.model, signal),
-			provider: SubagentContextAdapter.provider,
-			id: selected.model,
-			context: { contextWindow: selected.contextWindow }
-		};
-	}
-	stream(options) {
-		const selected = this.selection();
-		const { preparedCall: _preparedCall, ...forwarded } = options;
-		return this.llm.stream({
-			...forwarded,
-			provider: selected.provider,
-			model: selected.model
-		});
-	}
-};
-//#endregion
 //#region src/host/routes.ts
 const MAX_BODY_BYTES = 64 * 1024;
-function registerRoutes(ctx, oauth, usage, preferences) {
+function registerRoutes(ctx, oauth, usage, preferences, proxyManager) {
 	const handler = async (request, response) => {
 		const url = new URL(request.url ?? "/", "http://dsh.local");
-		if (request.method === "GET" && url.pathname === `/api/dsh-chatgpt-subscription/models`) {
-			json(response, {
-				ok: true,
-				value: await subagentModelCatalog(ctx)
-			});
-			return;
-		}
 		if (request.method === "GET" && url.pathname === `/api/dsh-chatgpt-subscription/status`) {
 			const oauthStatus = await oauth.status();
 			json(response, {
@@ -2441,7 +2624,9 @@ function registerRoutes(ctx, oauth, usage, preferences) {
 				value: {
 					...oauthStatus,
 					quota: await usage.status(oauthStatus.authenticated),
-					preferences: preferences.status()
+					preferences: preferences.status(),
+					detectedProxy: proxyManager?.getSystemProxy() ?? null,
+					activeProxy: proxyManager?.resolveActiveProxyUrl() ?? null
 				}
 			});
 			return;
@@ -2674,30 +2859,6 @@ function readPreferencesUpdate(value, current) {
 		if (value.searchProvider !== "dsh" && value.searchProvider !== "codex") throw new PreferenceError("searchProvider must be dsh or codex.");
 		patch.searchProvider = value.searchProvider;
 	}
-	if ("subagentProvider" in value) {
-		if (typeof value.subagentProvider !== "string" || value.subagentProvider === "") throw new PreferenceError("subagentProvider must be a non-empty string.");
-		patch.subagentProvider = value.subagentProvider;
-	}
-	if ("subagentModel" in value) {
-		if (typeof value.subagentModel !== "string" || value.subagentModel === "") throw new PreferenceError("subagentModel must be a non-empty string.");
-		patch.subagentModel = value.subagentModel;
-	}
-	if ("subagentReasoningEffort" in value) {
-		if (value.subagentReasoningEffort !== null && (typeof value.subagentReasoningEffort !== "string" || value.subagentReasoningEffort === "")) throw new PreferenceError("subagentReasoningEffort must be null or a non-empty string.");
-		patch.subagentReasoningEffort = value.subagentReasoningEffort;
-	}
-	if ("subagentContextWindow" in value) {
-		if (!Number.isSafeInteger(value.subagentContextWindow) || value.subagentContextWindow < 1) throw new PreferenceError("subagentContextWindow must be a positive integer.");
-		patch.subagentContextWindow = value.subagentContextWindow;
-	}
-	if ("subagentMaxDepth" in value) {
-		if (!Number.isSafeInteger(value.subagentMaxDepth) || value.subagentMaxDepth < 0 || value.subagentMaxDepth > 3) throw new PreferenceError(`subagentMaxDepth must be an integer from 0 to 3.`);
-		patch.subagentMaxDepth = value.subagentMaxDepth;
-	}
-	if ("subagentMaxAgents" in value) {
-		if (!Number.isSafeInteger(value.subagentMaxAgents) || value.subagentMaxAgents < 1) throw new PreferenceError("subagentMaxAgents must be a positive integer.");
-		patch.subagentMaxAgents = value.subagentMaxAgents;
-	}
 	if ("contextWindowOverrides" in value) {
 		if (!isRecord(value.contextWindowOverrides)) throw new PreferenceError("contextWindowOverrides must be an object.");
 		const overrides = {};
@@ -2708,55 +2869,24 @@ function readPreferencesUpdate(value, current) {
 		}
 		patch.contextWindowOverrides = overrides;
 	}
+	if ("subagentContextWindow" in value) {
+		if (value.subagentContextWindow !== null && (!Number.isSafeInteger(value.subagentContextWindow) || value.subagentContextWindow < 1)) throw new PreferenceError("subagentContextWindow must be null or a positive integer.");
+		patch.subagentContextWindow = value.subagentContextWindow;
+	}
+	if ("subagentMaxDepth" in value) {
+		if (value.subagentMaxDepth !== null && (!Number.isSafeInteger(value.subagentMaxDepth) || value.subagentMaxDepth < 0 || value.subagentMaxDepth > 3)) throw new PreferenceError(`subagentMaxDepth must be null or an integer from 0 to 3.`);
+		patch.subagentMaxDepth = value.subagentMaxDepth;
+	}
+	if ("proxyMode" in value) {
+		if (value.proxyMode !== "auto" && value.proxyMode !== "custom" && value.proxyMode !== "direct") throw new PreferenceError("proxyMode must be auto, custom, or direct.");
+		patch.proxyMode = value.proxyMode;
+	}
+	if ("customProxyUrl" in value) {
+		if (value.customProxyUrl !== null && typeof value.customProxyUrl !== "string") throw new PreferenceError("customProxyUrl must be a string or null.");
+		patch.customProxyUrl = value.customProxyUrl;
+	}
 	return patch;
 }
-async function subagentModelCatalog(ctx) {
-	const results = await Promise.all(ctx.llm.listProviders().filter((provider) => provider.id !== SubagentContextAdapter.provider).map(async (provider) => {
-		try {
-			const models = await ctx.llm.listModels(provider.id);
-			return {
-				kind: "provider",
-				provider: {
-					id: provider.id,
-					name: provider.name,
-					models: await Promise.all(models.map(async (model) => {
-						const resolved = await ctx.llm.resolveModelInfo(provider.id, model.id);
-						return {
-							id: model.id,
-							name: model.name,
-							...model.description === void 0 ? {} : { description: model.description },
-							...resolved.context === void 0 ? {} : {
-								contextWindow: resolved.context.contextWindow,
-								maxContextWindow: provider.id === "codex-chatgpt" && isConfigurableContextModelId(model.id) ? GPT_56_MAX_CONTEXT_WINDOW : resolved.context.contextWindow
-							},
-							...resolved.reasoning === void 0 ? {} : { reasoning: {
-								efforts: resolved.reasoning.efforts.map((effort) => ({
-									id: effort.id,
-									name: effort.name,
-									...effort.description === void 0 ? {} : { description: effort.description }
-								})),
-								...resolved.reasoning.defaultEffort === void 0 ? {} : { defaultEffort: resolved.reasoning.defaultEffort }
-							} }
-						};
-					}))
-				}
-			};
-		} catch (error) {
-			return {
-				kind: "failure",
-				failure: {
-					id: provider.id,
-					name: provider.name,
-					message: error instanceof Error ? error.message : String(error)
-				}
-			};
-		}
-	}));
-	return {
-		providers: results.filter((result) => result.kind === "provider").map((result) => result.provider),
-		failures: results.filter((result) => result.kind === "failure").map((result) => result.failure)
-	};
-}
 function json(response, envelope, status = 200) {
 	response.writeHead(status, {
 		"content-type": "application/json; charset=utf-8",
@@ -3118,7 +3248,8 @@ function createPlatformTokenStore(platform = process.platform) {
 //#region src/host/search-provider-switcher.ts
 var SearchProviderSwitcher = class {
 	loader;
-	originalProvider;
+	originalSearchProvider;
+	originalFetchProvider;
 	initialized = false;
 	constructor(loader) {
 		this.loader = loader;
@@ -3128,14 +3259,19 @@ var SearchProviderSwitcher = class {
 		if (entry === null) return;
 		const config = currentConfig(entry);
 		if (!this.initialized) {
-			this.originalProvider = typeof config.searchProvider === "string" && config.searchProvider !== "codex-subscription" ? config.searchProvider : void 0;
+			this.originalSearchProvider = typeof config.searchProvider === "string" && config.searchProvider !== "codex-subscription" ? config.searchProvider : void 0;
+			this.originalFetchProvider = typeof config.fetchProvider === "string" && config.fetchProvider !== "codex-subscription" ? config.fetchProvider : void 0;
 			this.initialized = true;
 		}
-		const selected = preference === "codex" ? CODEX_SEARCH_PROVIDER_ID : this.originalProvider;
-		if (config.searchProvider === selected) return;
+		const selected = preference === "codex" ? CODEX_SEARCH_PROVIDER_ID : void 0;
+		const nextSearch = selected ?? this.originalSearchProvider;
+		const nextFetch = selected ? CODEX_FETCH_PROVIDER_ID : this.originalFetchProvider;
+		if (config.searchProvider === nextSearch && config.fetchProvider === nextFetch) return;
 		const nextConfig = { ...config };
-		if (selected === void 0) delete nextConfig.searchProvider;
-		else nextConfig.searchProvider = selected;
+		if (nextSearch === void 0) delete nextConfig.searchProvider;
+		else nextConfig.searchProvider = nextSearch;
+		if (nextFetch === void 0) delete nextConfig.fetchProvider;
+		else nextConfig.fetchProvider = nextFetch;
 		await entry.update({ config: nextConfig }, true);
 	}
 	findWebEntry() {
@@ -3151,100 +3287,6 @@ function currentConfig(entry) {
 	return typeof config === "object" && config !== null && !Array.isArray(config) ? config : {};
 }
 //#endregion
-//#region src/host/subagent-model-preference.ts
-/** Apply the configured provider/model/reasoning route to every delegated Agent. */
-function installSubagentModelPreference(ctx, preferences) {
-	return ctx.on("agent/request", async (payload, next) => {
-		const resolved = await next();
-		if (payload.agent.session.header.origin !== "subagent") return resolved;
-		const selection = preferences.status();
-		return {
-			...resolved,
-			provider: SubagentContextAdapter.provider,
-			model: selection.subagentModel,
-			...selection.subagentReasoningEffort === null ? { reasoningEffort: void 0 } : { reasoningEffort: ReasoningEffortId(selection.subagentReasoningEffort) }
-		};
-	});
-}
-//#endregion
-//#region src/host/subagent-policy.ts
-const MANAGED_DELEGATION_TOOLS = /* @__PURE__ */ new Set(["subagent", "subagent_fork"]);
-/**
-* Enforce global limits with a user-facing preflight on built-in delegation
-* tools and an authoritative synchronous Agent-publication gate. The latter
-* also covers workflows, Ralph, and nested subagents without depending on the
-* parent's provider or model. Throwing from `agent/created` vetoes and rolls
-* back the new child before its loop starts; already-running children remain.
-*/
-function installSubagentPolicy(ctx, preferences) {
-	const disposePreflight = ctx.on("tools/pre-execute", async (exec, next) => {
-		const parent = exec.agent;
-		if (parent === void 0 || !MANAGED_DELEGATION_TOOLS.has(exec.name)) return next();
-		const { subagentMaxDepth, subagentMaxAgents } = preferences.status();
-		const attemptedDepth = delegationDepthOf(parent) + 1;
-		if (attemptedDepth > subagentMaxDepth) return {
-			kind: "deny",
-			reason: `Subagent nesting depth limit reached: attempted depth ${attemptedDepth}, configured maximum ${subagentMaxDepth}.`
-		};
-		const activeAgents = activeDescendantCount(ctx, subagentTreeRoot(ctx, parent).id);
-		if (activeAgents >= subagentMaxAgents) return {
-			kind: "deny",
-			reason: `Subagent limit reached: ${activeAgents} active descendants in the Agent tree, configured maximum ${subagentMaxAgents}. Wait for one to finish or raise the global limit in Subagents settings.`
-		};
-		return next();
-	});
-	const disposePublicationGate = ctx.on("agent/created", ({ agent }) => {
-		if (agent.session.header.origin !== "subagent") return;
-		const { subagentMaxDepth, subagentMaxAgents } = preferences.status();
-		const depth = delegationDepthOf(agent);
-		if (depth > subagentMaxDepth) throw new Error(`Subagent nesting depth limit reached: attempted depth ${depth}, configured maximum ${subagentMaxDepth}.`);
-		const activeAgents = activeDescendantCount(ctx, subagentTreeRoot(ctx, agent).id);
-		if (activeAgents > subagentMaxAgents) throw new Error(`Subagent limit reached: attempted ${activeAgents} active descendants in the Agent tree, configured maximum ${subagentMaxAgents}. Wait for one to finish or raise the global limit in Subagents settings.`);
-	});
-	return () => {
-		disposePublicationGate();
-		disposePreflight();
-	};
-}
-/** Return the highest currently live ancestor that owns this subagent tree. */
-function subagentTreeRoot(ctx, agent) {
-	let current = agent;
-	const visited = /* @__PURE__ */ new Set([agent.id]);
-	while (current.session.header.origin === "subagent") {
-		const parentId = current.session.header.parentSession;
-		if (parentId === void 0 || visited.has(parentId)) break;
-		const parent = ctx.agents.get(parentId);
-		if (parent === void 0) break;
-		visited.add(parent.id);
-		current = parent;
-	}
-	return current;
-}
-/** Return currently live descendants in one caller's subagent tree. */
-function activeDescendantIds(ctx, parentId) {
-	const childrenByParent = /* @__PURE__ */ new Map();
-	for (const agent of ctx.agents.list()) {
-		if (agent.session.header.origin !== "subagent") continue;
-		const directParent = agent.session.header.parentSession;
-		if (directParent === void 0) continue;
-		const children = childrenByParent.get(directParent) ?? [];
-		children.push(agent.id);
-		childrenByParent.set(directParent, children);
-	}
-	const descendants = /* @__PURE__ */ new Set();
-	const pending = [...childrenByParent.get(parentId) ?? []];
-	while (pending.length > 0) {
-		const id = pending.pop();
-		if (descendants.has(id)) continue;
-		descendants.add(id);
-		pending.push(...childrenByParent.get(id) ?? []);
-	}
-	return descendants;
-}
-function activeDescendantCount(ctx, parentId) {
-	return activeDescendantIds(ctx, parentId).size;
-}
-//#endregion
 //#region src/index.ts
 const inject = [
 	"webServer",
@@ -3253,53 +3295,61 @@ const inject = [
 	"tools",
 	"web",
 	"settings",
-	"loader",
-	"agents"
+	"loader"
 ];
 function apply(ctx) {
-	const oauth = new OAuthService(createPlatformTokenStore(), { logger: ctx.logger });
-	const usage = new UsageService(oauth);
+	const store = createPlatformTokenStore();
 	const preferences = registerPreferenceStore(ctx.settings);
-	const adapter = new CodexChatGptAdapter(new ResponsesClient(oauth, ctx.attachments, {
-		localRawImages: { baseUrl: localWebServerBaseUrl(ctx.webServer.host, ctx.webServer.port) },
-		onGenerationFinished: () => usage.invalidate(),
-		outputVerbosity: () => preferences.status().outputVerbosity,
-		fastMode: () => preferences.status().fastMode
-	}), preferences);
 	ctx.effect(() => {
+		const proxyManager = new ProxyManager({
+			getPreferences: () => preferences.status(),
+			logger: ctx.logger
+		});
+		const proxyFetch = proxyManager.createFetch();
+		const oauth = new OAuthService(store, {
+			fetchFn: proxyFetch,
+			logger: ctx.logger
+		});
+		const usage = new UsageService(oauth, { fetchFn: proxyFetch });
+		const adapter = new CodexChatGptAdapter(new ResponsesClient(oauth, ctx.attachments, {
+			fetchFn: proxyFetch,
+			localRawImages: { baseUrl: localWebServerBaseUrl(ctx.webServer.host, ctx.webServer.port) },
+			onGenerationFinished: () => usage.invalidate(),
+			outputVerbosity: () => preferences.status().outputVerbosity,
+			fastMode: () => preferences.status().fastMode
+		}), preferences);
 		const searchSwitcher = new SearchProviderSwitcher(ctx.loader);
 		const applySearchPreference = (searchProvider = preferences.status().searchProvider) => {
 			searchSwitcher.select(searchProvider).catch((error) => {
 				ctx.logger.warn(`[dsh-chatgpt-subscription] Search provider preference could not be applied: ${error instanceof Error ? error.message : String(error)}`);
 			});
 		};
-		const disposeRoutes = registerRoutes(ctx, oauth, usage, preferences);
+		const disposeRoutes = registerRoutes(ctx, oauth, usage, preferences, proxyManager);
 		const disposeAdapter = ctx.llm.registerAdapter([PROVIDER_ID], adapter);
-		const subagentContextAdapter = new SubagentContextAdapter(ctx.llm, () => {
-			const selected = preferences.status();
-			return {
-				provider: selected.subagentProvider,
-				model: selected.subagentModel,
-				contextWindow: selected.subagentContextWindow
-			};
-		});
-		const disposeSubagentContextAdapter = ctx.llm.registerAdapter([SubagentContextAdapter.provider], subagentContextAdapter);
-		const disposeSubagentModelPreference = installSubagentModelPreference(ctx, preferences);
-		const disposeSubagentPolicy = installSubagentPolicy(ctx, preferences);
-		const disposeImageTool = ctx.tools.register(createCodexImageTool(oauth, ctx.attachments));
-		const disposeSearchProvider = ctx.web.registerSearchProvider(createCodexSearchProvider(oauth));
+		const disposeImageTool = ctx.tools.register(createCodexImageTool(oauth, ctx.attachments, { fetchFn: proxyFetch }));
+		let disposeWebProviders = () => {};
+		const registerWebProviders = () => {
+			disposeWebProviders();
+			if (ctx.web) {
+				const d1 = ctx.web.registerSearchProvider(createCodexSearchProvider(oauth, { fetchFn: proxyFetch }));
+				const d2 = ctx.web.registerFetchProvider(createCodexFetchProvider({ fetchFn: proxyFetch }));
+				disposeWebProviders = () => {
+					d1();
+					d2();
+				};
+			}
+		};
+		registerWebProviders();
 		const disposePreferenceWatch = preferences.watch((next) => applySearchPreference(next.searchProvider));
 		applySearchPreference();
 		return () => {
 			disposePreferenceWatch();
-			disposeSubagentPolicy();
-			disposeSubagentModelPreference();
-			disposeSearchProvider();
+			disposeWebProviders();
 			disposeImageTool();
-			disposeSubagentContextAdapter();
 			disposeAdapter();
 			disposeRoutes();
 			oauth.dispose();
+			proxyManager.dispose();
 		};
 	}, "dsh-chatgpt-subscription: adapter, routes, and lifecycle");
 }
@@ -3307,4 +3357,4 @@ function localWebServerBaseUrl(host, port) {
 	return `http://${host === "0.0.0.0" ? "127.0.0.1" : host}:${port}`;
 }
 //#endregion
-export { CodexChatGptAdapter, LinuxFileTokenStore, MacKeychainTokenStore, OAuthService, ResponsesClient, UsageService, WindowsDpapiTokenStore, apply, createCodexImageTool, createCodexSearchProvider, createPlatformTokenStore, inject, mapCodexUsage, parseCodexUsage, parseResponsesStream };
+export { CodexChatGptAdapter, LinuxFileTokenStore, MacKeychainTokenStore, OAuthService, ProxyManager, ResponsesClient, UsageService, WindowsDpapiTokenStore, apply, createCodexFetchProvider, createCodexImageTool, createCodexSearchProvider, createPlatformTokenStore, detectSystemProxy, inject, mapCodexUsage, parseCodexUsage, parseResponsesStream };