dsh-coding-subscription-oauth 0.6.2 → 0.6.4

package/src/client/constants.ts

@@ -117,6 +117,12 @@ export const CAPABILITY_TOGGLES: readonly {
 	{ key: "codexSearch", label: "capCodexSearch", hint: "capCodexSearchHint" },
 	{ key: "codexImages", label: "capCodexImages", hint: "capCodexImagesHint" },
 	{ key: "codexImageEdits", label: "capCodexImageEdits", hint: "capCodexImageEditsHint", requiresImages: true },
+	{
+		key: "codexImagesAnyModel",
+		label: "capCodexImagesAnyModel",
+		hint: "capCodexImagesAnyModelHint",
+		requiresImages: true,
+	},
 	{ key: "codexUsage", label: "capCodexUsage", hint: "capCodexUsageHint" },
 	{ key: "codexFast", label: "capCodexFast", hint: "capCodexFastHint" },
 	{ key: "grokImagineImage", label: "capGrokImagineImage", hint: "capGrokImagineImageHint" },
@@ -221,4 +227,4 @@ export const CONSUMED_PREVIEW_CODES = new Set([
 	"unsafe_destination",
 ]);
 
-export const PLUGIN_VERSION = "0.6.2";
+export const PLUGIN_VERSION = "0.6.4";

package/src/client/locales.ts

@@ -139,6 +139,9 @@ export const en = {
 	capCodexImagesHint: "Generate images with ChatGPT/Codex quota.",
 	capCodexImageEdits: "Codex image edits",
 	capCodexImageEditsHint: "Edit images; requires Codex images.",
+	capCodexImagesAnyModel: "Allow any model to use image tools",
+	capCodexImagesAnyModelHint:
+		"Let non-Codex routes also call image generate/edit. Still uses your ChatGPT/Codex quota and requires Codex sign-in.",
 	capCodexUsage: "Show Codex quota",
 	capCodexUsageHint: "Show remaining quota on the Codex account card when available.",
 	capCodexFast: "Fast requested",
@@ -404,6 +407,8 @@ export const zh: { [Key in GrokBuildSettingsKey]: string } = {
 	capCodexImagesHint: "用 ChatGPT/Codex 配额出图。",
 	capCodexImageEdits: "Codex 改图",
 	capCodexImageEditsHint: "改图；需先打开 Codex 出图。",
+	capCodexImagesAnyModel: "允许任意模型调用出图工具",
+	capCodexImagesAnyModelHint: "非 Codex 渠道的模型也可调用图片生成/编辑。仍消耗 ChatGPT/Codex 配额，且需登录 Codex。",
 	capCodexUsage: "显示 Codex 额度",
 	capCodexUsageHint: "有数据时在 Codex 账户卡片上显示剩余额度。",
 	capCodexFast: "已请求 Fast",

package/src/client/parsers.ts

@@ -167,6 +167,7 @@ export function emptyCapabilitySettings(): CapabilitySettingsView {
 		codexSearch: false,
 		codexImages: false,
 		codexImageEdits: false,
+		codexImagesAnyModel: false,
 		codexUsage: false,
 		codexFast: false,
 		grokImagineImage: false,
@@ -183,6 +184,7 @@ export function parseCapabilitySettings(value: unknown): CapabilitySettingsView
 		codexSearch: source["codexSearch"] === true,
 		codexImages: source["codexImages"] === true,
 		codexImageEdits: source["codexImageEdits"] === true,
+		codexImagesAnyModel: source["codexImagesAnyModel"] === true,
 		codexUsage: source["codexUsage"] === true,
 		codexFast: source["codexFast"] === true,
 		grokImagineImage: source["grokImagineImage"] === true,

package/src/client/types.ts

@@ -21,6 +21,7 @@ export type CapabilityFlagKey =
 	| "codexSearch"
 	| "codexImages"
 	| "codexImageEdits"
+	| "codexImagesAnyModel"
 	| "codexUsage"
 	| "codexFast"
 	| "grokImagineImage"
@@ -121,6 +122,7 @@ export interface CapabilityFlags {
 	codexSearch: boolean;
 	codexImages: boolean;
 	codexImageEdits: boolean;
+	codexImagesAnyModel: boolean;
 	codexUsage: boolean;
 	codexFast: boolean;
 	grokImagineImage: boolean;

package/src/codex-images.ts

@@ -71,6 +71,13 @@ export interface CodexImageSessionContext {
 	route?: CodexImageRoute;
 }
 
+/**
+ * Route gate for the image tools. `codex-capable` (default) requires a Codex
+ * OAuth route that declares image input; `any` lets any model route call the
+ * tools while the ChatGPT subscription backend still performs the work.
+ */
+export type CodexImageRoutePolicy = "codex-capable" | "any";
+
 export interface CodexImageGenerateInput {
 	readonly prompt: string;
 	readonly n?: number;
@@ -101,6 +108,8 @@ export interface CodexImageControllerOptions {
 	readonly auth: CodexAuthSession;
 	readonly attachments: CodexImageAttachmentStore;
 	readonly session: CodexImageSessionContext;
+	/** Route gate; defaults to `codex-capable`. Set `any` to allow non-Codex routes. */
+	readonly routePolicy?: CodexImageRoutePolicy;
 	readonly http?: CodexHttpClient;
 	readonly fetchImpl?: CodexFetch;
 	readonly originator?: string;
@@ -283,6 +292,12 @@ function enumValue<const T extends string>(value: T | undefined, allowed: readon
 	return value;
 }
 
+async function assertSignedIn(auth: CodexAuthSession): Promise<void> {
+	if ((await auth.resolve()) === undefined) {
+		throw new LlmError("Codex image tools require a signed-in Codex account", "MISSING_CREDENTIAL");
+	}
+}
+
 function imageEnvelopeLimit(maxImageBytes: number, n: number): number {
 	return Math.ceil(maxImageBytes / 3) * 4 * Math.max(1, n) + 128 * 1024;
 }
@@ -301,7 +316,9 @@ async function prepareRequest(
 	imageIds: readonly string[] | undefined,
 	signal?: AbortSignal,
 ): Promise<PreparedImageRequest> {
-	assertCodexImageCapableRoute(options.session.route);
+	if (options.routePolicy !== "any") {
+		assertCodexImageCapableRoute(options.session.route);
+	}
 	const prompt = input.prompt.trim();
 	if (prompt.length === 0) {
 		throw new LlmError("Codex image generation requires a non-empty prompt", "INVALID_ARGS");
@@ -467,6 +484,7 @@ export function createCodexImageController(options: CodexImageControllerOptions)
 		imageIds: readonly string[] | undefined,
 		signal?: AbortSignal,
 	): Promise<CodexImageResult> => {
+		await assertSignedIn(options.auth);
 		const prepared = await prepareRequest(options, input, imageIds, signal);
 		const payload = await http.requestJson({
 			url: prepared.operation === "generate" ? CODEX_IMAGE_GENERATION_URL : CODEX_IMAGE_EDIT_URL,

package/src/compatibility.ts

@@ -28,20 +28,20 @@ export interface DshCompatibility {
 
 export const DSH_EXACT_BOM = Object.freeze({
 	"@deepseek-ai/cordis": "4.0.1",
-	"@deepseek-ai/dsh-atomic-write": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-attachment": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-client-locale": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-client-runtime": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-client-ui-settings": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-client-ui-slots": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-client-web": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-credentials": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-home-paths": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-host-webserver": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-invariants": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-llm": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-llm-pi-ai": "0.1.1-rc.2",
-	"@deepseek-ai/dsh-tools": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-atomic-write": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-attachment": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-client-locale": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-client-runtime": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-client-ui-settings": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-client-ui-slots": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-client-web": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-credentials": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-home-paths": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-host-webserver": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-invariants": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-llm": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-llm-pi-ai": "0.1.1-rc.2",
+	"@deepseek-ai/dsh-tools": "0.1.1-rc.2",
 	"@deepseek-ai/schemastery": "3.18.1",
 	"@earendil-works/pi-ai": "0.84.2",
 	react: "18.3.1",

package/src/index.ts

@@ -240,7 +240,7 @@ function fixedCredentialRef(value: string): CredentialRef {
 export { IMAGINE_MEDIA_STORE_DIRNAME } from "./ids.ts";
 
 /** Optional host services are acquired inside the elected child fiber. */
-export const inject = ["webServer"] as const;
+export const inject = ["webServer"] as const;
 
 /** Plugin configuration; every field is optional. */
 export interface Config {
@@ -571,27 +571,27 @@ async function applyOwned(ctx: Context, config: Config): Promise<void> {
 		return () => gateway.stop();
 	}, "dsh-coding-subscription-oauth: local API gateway");
 
-	registerCapabilityRoutes(ctx, {
-		controller: capabilityRoutesController,
-		usage: () => usage.read(),
-		credentialInfo: () => describeImagineCredential(ctx.get("credentials") as CredentialProvider | undefined),
-		ownerRequestPolicy,
-	});
-	registerGatewayRoutes(ctx, gateway, ownerRequestPolicy);
-	registerCodingOAuthRoutes(ctx, grok, subscriptions, ownerRequestPolicy, (accessMode) =>
-		host.compatibility({
-			accessMode,
-			uiOwner: "standalone",
-			diagnostics: ownerRequestPolicy.diagnostics(),
-		}),
-	);
-	registerOAuthImportRoutes(ctx, oauthImportDestinations(grok, subscriptions), {
-		ownerRequestPolicy,
-		onImported: (event) => {
-			if (event.kind === "codex") invalidateOptionalAuthState();
-			notifyCatalogChange();
-		},
-	});
+	registerCapabilityRoutes(ctx, {
+		controller: capabilityRoutesController,
+		usage: () => usage.read(),
+		credentialInfo: () => describeImagineCredential(ctx.get("credentials") as CredentialProvider | undefined),
+		ownerRequestPolicy,
+	});
+	registerGatewayRoutes(ctx, gateway, ownerRequestPolicy);
+	registerCodingOAuthRoutes(ctx, grok, subscriptions, ownerRequestPolicy, (accessMode) =>
+		host.compatibility({
+			accessMode,
+			uiOwner: "standalone",
+			diagnostics: ownerRequestPolicy.diagnostics(),
+		}),
+	);
+	registerOAuthImportRoutes(ctx, oauthImportDestinations(grok, subscriptions), {
+		ownerRequestPolicy,
+		onImported: (event) => {
+			if (event.kind === "codex") invalidateOptionalAuthState();
+			notifyCatalogChange();
+		},
+	});
 
 	const search = createCodexSearchProvider({
 		auth: codexAuth,
@@ -680,10 +680,10 @@ async function applyOwned(ctx: Context, config: Config): Promise<void> {
 
 	// Only adapters and LLM-backed model resolution depend on this service. Its
 	// child fiber may unload and reload without disturbing OAuth/Web ownership.
-	ctx.inject(["llm"], (llmCtx) =>
-		applyOwnedLlm(llmCtx, config, { grok, subscriptions, runtime, codexAuth, codexModels, logger }),
-	);
-}
+	ctx.inject(["llm"], (llmCtx) =>
+		applyOwnedLlm(llmCtx, config, { grok, subscriptions, runtime, codexAuth, codexModels, logger }),
+	);
+}
 
 interface OwnedLlmDependencies {
 	readonly grok: GrokBuildSession;