@eddyskywalker/dsh-chatgpt-subscription 0.1.12 → 0.1.14

package/lib/index.js

@@ -6,11 +6,11 @@ import { WebError } from "@deepseek-ai/dsh-web";
 import http from "node:http";
 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 { spawn } from "node:child_process";
 //#region src/compat.ts
 /**
 * Compatibility constants for the ChatGPT-backed Codex flow. The backend and
@@ -41,6 +41,7 @@ const OAUTH_AUTHORIZE_URL = `${CHATGPT_OAUTH_ISSUER}/oauth/authorize`;
 const OAUTH_TOKEN_URL = `${CHATGPT_OAUTH_ISSUER}/oauth/token`;
 //#endregion
 //#region src/shared/model-catalog.ts
+const GPT_56_MAX_CONTEXT_WINDOW = 1e6;
 const CODEX_MODEL_CATALOG = [
 	{
 		id: "gpt-5.6-sol",
@@ -107,6 +108,17 @@ const CODEX_MODEL_CATALOG = [
 	}
 ];
 const DEFAULT_CODEX_MODEL = CODEX_MODEL_CATALOG[0];
+const CONFIGURABLE_CONTEXT_MODEL_IDS = [
+	"gpt-5.6-sol",
+	"gpt-5.6-terra",
+	"gpt-5.6-luna"
+];
+function isCodexModelId(model) {
+	return typeof model === "string" && CODEX_MODEL_CATALOG.some((entry) => entry.id === model);
+}
+function isConfigurableContextModelId(model) {
+	return typeof model === "string" && CONFIGURABLE_CONTEXT_MODEL_IDS.some((id) => id === model);
+}
 function resolveCodexCatalogEntry(model) {
 	return CODEX_MODEL_CATALOG.find((entry) => entry.id === model) ?? DEFAULT_CODEX_MODEL;
 }
@@ -139,15 +151,16 @@ function listCodexModels() {
 		inputModalities: [...entry.inputModalities]
 	}));
 }
-function resolveCodexModel(model) {
+function resolveCodexModel(model, preferences) {
 	const entry = resolveCodexCatalogEntry(model);
+	const configuredContextWindow = isConfigurableContextModelId(model) ? preferences?.status().contextWindowOverrides[model] : void 0;
 	const efforts = MODEL_REASONING[entry.reasoningProfile];
 	return {
 		provider: PROVIDER_ID,
 		id: model,
 		name: entry.id === model ? entry.name : model,
 		inputModalities: [...entry.inputModalities],
-		context: { contextWindow: entry.contextWindow },
+		context: { contextWindow: configuredContextWindow ?? entry.contextWindow },
 		defaultMaxTokens: 32768,
 		reasoning: {
 			efforts: efforts.map((effort) => ({
@@ -176,9 +189,11 @@ const RETRY_POLICY = resolveRetryPolicy({
 }, "dsh-chatgpt-subscription.retry");
 var CodexChatGptAdapter = class extends LlmAdapter {
 	client;
-	constructor(client) {
+	preferences;
+	constructor(client, preferences) {
 		super();
 		this.client = client;
+		this.preferences = preferences;
 	}
 	providerInfo(provider) {
 		return {
@@ -193,7 +208,7 @@ var CodexChatGptAdapter = class extends LlmAdapter {
 		return listCodexModels();
 	}
 	async resolveModel(_provider, model) {
-		return resolveCodexModel(model);
+		return resolveCodexModel(model, this.preferences);
 	}
 	stream(options) {
 		return this.client.stream(options);
@@ -1049,7 +1064,13 @@ async function oauthErrorIdentifier(response) {
 const PREFERENCES_NAMESPACE = "dsh-chatgpt-subscription";
 const DEFAULT_PREFERENCES = {
 	quickQuotaVisible: false,
-	searchProvider: "dsh"
+	searchProvider: "dsh",
+	subagentModel: "gpt-5.6-sol",
+	contextWindowOverrides: {
+		"gpt-5.6-sol": 272e3,
+		"gpt-5.6-terra": 272e3,
+		"gpt-5.6-luna": 272e3
+	}
 };
 const SEARCH_PROVIDER_CODEX = "codex";
 function isSearchProviderPreference(value) {
@@ -1060,7 +1081,13 @@ function isSearchProviderPreference(value) {
 function registerPreferenceStore(settings) {
 	return new SettingsPreferenceStore(settings.register(settingsNamespace(PREFERENCES_NAMESPACE), z.object({
 		quickQuotaVisible: z.boolean().default(DEFAULT_PREFERENCES.quickQuotaVisible),
-		searchProvider: z.union([z.const("dsh"), z.const(SEARCH_PROVIDER_CODEX)]).default(DEFAULT_PREFERENCES.searchProvider)
+		searchProvider: z.union([z.const("dsh"), z.const(SEARCH_PROVIDER_CODEX)]).default(DEFAULT_PREFERENCES.searchProvider),
+		subagentModel: z.string().default(DEFAULT_PREFERENCES.subagentModel),
+		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)
 	})));
 }
 var SettingsPreferenceStore = class {
@@ -1078,6 +1105,11 @@ var SettingsPreferenceStore = class {
 			if (!isSearchProviderPreference(patch.searchProvider)) throw new PreferenceError("Unsupported search provider preference.");
 			normalized.searchProvider = patch.searchProvider;
 		}
+		if (patch.subagentModel !== void 0) normalized.subagentModel = patch.subagentModel;
+		if (patch.contextWindowOverrides !== void 0) normalized.contextWindowOverrides = {
+			...this.scope.get().contextWindowOverrides,
+			...patch.contextWindowOverrides
+		};
 		await this.scope.update(normalized);
 		return this.status();
 	}
@@ -2342,6 +2374,9 @@ function field(value, name) {
 	const candidate = value[name];
 	return typeof candidate === "string" && candidate !== "" ? candidate : null;
 }
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function readPreferencesUpdate(value) {
 	const patch = {};
 	if ("quickQuotaVisible" in value) {
@@ -2352,6 +2387,20 @@ function readPreferencesUpdate(value) {
 		if (value.searchProvider !== "dsh" && value.searchProvider !== "codex") throw new PreferenceError("searchProvider must be dsh or codex.");
 		patch.searchProvider = value.searchProvider;
 	}
+	if ("subagentModel" in value) {
+		if (!isCodexModelId(value.subagentModel)) throw new PreferenceError("subagentModel must be an available Codex model.");
+		patch.subagentModel = value.subagentModel;
+	}
+	if ("contextWindowOverrides" in value) {
+		if (!isRecord(value.contextWindowOverrides)) throw new PreferenceError("contextWindowOverrides must be an object.");
+		const overrides = {};
+		for (const [model, contextWindow] of Object.entries(value.contextWindowOverrides)) {
+			if (!isConfigurableContextModelId(model)) throw new PreferenceError("Only GPT-5.6 context windows can be changed.");
+			if (!Number.isSafeInteger(contextWindow) || contextWindow < 1 || contextWindow > 1e6) throw new PreferenceError(`contextWindowOverrides.${model} must be a positive integer no greater than the provider limit.`);
+			overrides[model] = contextWindow;
+		}
+		patch.contextWindowOverrides = overrides;
+	}
 	return patch;
 }
 function json(response, envelope, status = 200) {
@@ -2401,6 +2450,106 @@ function parseStoredCredentials(value) {
 	};
 }
 //#endregion
+//#region src/host/token-store-macos.ts
+const DEFAULT_SERVICE = "dsh-chatgpt-subscription";
+const DEFAULT_ACCOUNT = "oauth";
+/**
+* macOS credential storage backed by the login Keychain through the built-in
+* `security` command-line tool. The payload is encrypted at rest by the
+* Keychain, so this store reports itself as encrypted like Windows DPAPI.
+*/
+var MacKeychainTokenStore = class {
+	service;
+	account;
+	storage = {
+		kind: "macos-keychain",
+		encrypted: true
+	};
+	constructor(service = DEFAULT_SERVICE, account = DEFAULT_ACCOUNT) {
+		this.service = service;
+		this.account = account;
+		if (process.platform !== "darwin") throw new Error("macOS Keychain storage requires macOS");
+	}
+	async load() {
+		const result = await runSecurity([
+			"find-generic-password",
+			"-a",
+			this.account,
+			"-s",
+			this.service,
+			"-w"
+		]);
+		if (result.code === 44) return null;
+		if (result.code !== 0) throw new Error("Keychain credential read failed");
+		try {
+			const payload = result.stdout.replace(/\r?\n$/, "");
+			return parseStoredCredentials(JSON.parse(payload));
+		} catch {
+			throw new Error("Keychain credential payload is invalid");
+		}
+	}
+	async save(value) {
+		if ((await runSecurity([
+			"add-generic-password",
+			"-a",
+			this.account,
+			"-s",
+			this.service,
+			"-w",
+			JSON.stringify(value),
+			"-U"
+		])).code !== 0) throw new Error("Keychain credential write failed");
+	}
+	async clear() {
+		const result = await runSecurity([
+			"delete-generic-password",
+			"-a",
+			this.account,
+			"-s",
+			this.service
+		]);
+		if (result.code !== 0 && result.code !== 44) throw new Error("Keychain credential deletion failed");
+	}
+};
+function runSecurity(args) {
+	return new Promise((resolve, reject) => {
+		const child = spawn("security", args, {
+			env: { ...process.env },
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			]
+		});
+		let stdout = "";
+		let stderrLength = 0;
+		const timer = setTimeout(() => {
+			child.kill();
+			reject(/* @__PURE__ */ new Error("Keychain helper timed out"));
+		}, 1e4);
+		child.stdout.setEncoding("utf8");
+		child.stdout.on("data", (chunk) => {
+			stdout += chunk;
+			if (stdout.length > 1 << 20) child.kill();
+		});
+		child.stderr.on("data", (chunk) => {
+			stderrLength += chunk.length;
+			if (stderrLength > 1 << 20) child.kill();
+		});
+		child.once("error", (error) => {
+			clearTimeout(timer);
+			reject(error);
+		});
+		child.once("close", (code) => {
+			clearTimeout(timer);
+			resolve({
+				code: code ?? 1,
+				stdout
+			});
+		});
+	});
+}
+//#endregion
 //#region src/host/token-store-linux.ts
 const DIRECTORY_MODE = 448;
 const FILE_MODE = 384;
@@ -2607,8 +2756,9 @@ function runPowerShell(script, path, stdin) {
 //#region src/host/platform-token-store.ts
 function createPlatformTokenStore(platform = process.platform) {
 	if (platform === "win32") return new WindowsDpapiTokenStore();
+	if (platform === "darwin") return new MacKeychainTokenStore();
 	if (platform === "linux") return new LinuxFileTokenStore();
-	throw new Error(`Unsupported platform ${platform}; dsh-chatgpt-subscription supports Windows and Linux.`);
+	throw new Error(`Unsupported platform ${platform}; dsh-chatgpt-subscription supports Windows, macOS, and Linux.`);
 }
 //#endregion
 //#region src/host/search-provider-switcher.ts
@@ -2647,6 +2797,23 @@ function currentConfig(entry) {
 	return typeof config === "object" && config !== null && !Array.isArray(config) ? config : {};
 }
 //#endregion
+//#region src/host/subagent-model-preference.ts
+/**
+* Route in-process delegated agents through the configured ChatGPT subscription
+* model. Root sessions retain their own model selection.
+*/
+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;
+		return {
+			...resolved,
+			provider: PROVIDER_ID,
+			model: preferences.status().subagentModel
+		};
+	});
+}
+//#endregion
 //#region src/index.ts
 const inject = [
 	"webServer",
@@ -2664,7 +2831,7 @@ function apply(ctx) {
 	const adapter = new CodexChatGptAdapter(new ResponsesClient(oauth, ctx.attachments, {
 		localRawImages: { baseUrl: localWebServerBaseUrl(ctx.webServer.host, ctx.webServer.port) },
 		onGenerationFinished: () => usage.invalidate()
-	}));
+	}), preferences);
 	ctx.effect(() => {
 		const searchSwitcher = new SearchProviderSwitcher(ctx.loader);
 		const applySearchPreference = (searchProvider = preferences.status().searchProvider) => {
@@ -2674,12 +2841,14 @@ function apply(ctx) {
 		};
 		const disposeRoutes = registerRoutes(ctx, oauth, usage, preferences);
 		const disposeAdapter = ctx.llm.registerAdapter([PROVIDER_ID], adapter);
+		const disposeSubagentModelPreference = installSubagentModelPreference(ctx, preferences);
 		const disposeImageTool = ctx.tools.register(createCodexImageTool(oauth, ctx.attachments));
 		const disposeSearchProvider = ctx.web.registerSearchProvider(createCodexSearchProvider(oauth));
 		const disposePreferenceWatch = preferences.watch((next) => applySearchPreference(next.searchProvider));
 		applySearchPreference();
 		return () => {
 			disposePreferenceWatch();
+			disposeSubagentModelPreference();
 			disposeSearchProvider();
 			disposeImageTool();
 			disposeAdapter();
@@ -2692,4 +2861,4 @@ function localWebServerBaseUrl(host, port) {
 	return `http://${host === "0.0.0.0" ? "127.0.0.1" : host}:${port}`;
 }
 //#endregion
-export { CodexChatGptAdapter, LinuxFileTokenStore, OAuthService, ResponsesClient, UsageService, WindowsDpapiTokenStore, apply, createCodexImageTool, createCodexSearchProvider, createPlatformTokenStore, inject, mapCodexUsage, parseCodexUsage, parseResponsesStream };
+export { CodexChatGptAdapter, LinuxFileTokenStore, MacKeychainTokenStore, OAuthService, ResponsesClient, UsageService, WindowsDpapiTokenStore, apply, createCodexImageTool, createCodexSearchProvider, createPlatformTokenStore, inject, mapCodexUsage, parseCodexUsage, parseResponsesStream };

package/lib/types/client/CodexSubscriptionSection.d.ts

@@ -12,6 +12,7 @@ export declare function QuotaBar({ label, window, t }: {
     t: Translate;
 }): React.JSX.Element;
 export declare function windowLabel(minutes: number | null, t: Translate): string;
+export declare function parseCapacity(value: string): number | null;
 export declare function formatReset(seconds: number): string;
 export {};
 //# sourceMappingURL=CodexSubscriptionSection.d.ts.map

package/lib/types/client/CodexSubscriptionSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CodexSubscriptionSection.d.ts","sourceRoot":"","sources":["../../../src/client/CodexSubscriptionSection.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACjF,OAAO,KAAK,EAAE,oBAAoB,EAAmC,cAAc,EAAoC,MAAM,wBAAwB,CAAA;AAGrJ,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAA;AAGjC,KAAK,KAAK,GAAG,YAAY,CAAC,kBAAkB,CAAC,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;AAEtE,KAAK,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;AAE3B,wBAAgB,wBAAwB,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAuOxE;AAiBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,oBAAoB,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,GAAG,MAAM,CAM5F;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,GAAG,MAAM,CAM7F;AAcD,wBAAgB,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,cAAc,CAAC;IAAC,CAAC,EAAE,SAAS,CAAA;CAAE,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAczH;AAMD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,CAAC,EAAE,SAAS,GAAG,MAAM,CAQxE;AAqBD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAUnD"}
+{"version":3,"file":"CodexSubscriptionSection.d.ts","sourceRoot":"","sources":["../../../src/client/CodexSubscriptionSection.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AACjF,OAAO,KAAK,EAAE,oBAAoB,EAAmC,cAAc,EAAoC,MAAM,wBAAwB,CAAA;AAGrJ,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAA;AAGjC,KAAK,KAAK,GAAG,YAAY,CAAC,kBAAkB,CAAC,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;AAEtE,KAAK,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;AAE3B,wBAAgB,wBAAwB,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CA4QxE;AAiBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,oBAAoB,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,GAAG,MAAM,CAO5F;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,GAAG,MAAM,CAO7F;AAcD,wBAAgB,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,cAAc,CAAC;IAAC,CAAC,EAAE,SAAS,CAAA;CAAE,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAczH;AAMD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,CAAC,EAAE,SAAS,GAAG,MAAM,CAQxE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAO1D;AA0BD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAUnD"}