dsh-image-gen 0.6.7 → 0.6.9

package/lib/index.js

@@ -6006,6 +6006,15 @@ const CLOUD_IMAGE_PROVIDERS = [
 	"zhipu"
 ];
 /**
+* Providers the browser workbench can drive: the BYOK cloud set plus the
+* logged-in subscription channels. ComfyUI stays out; it has its own workflow
+* pipeline and no shared request shape.
+*/
+const STUDIO_PROVIDERS = [...CLOUD_IMAGE_PROVIDERS, ...SUBSCRIPTION_PROVIDERS];
+/** Timeout for one subscription image call, shared by the tool path and the
+* studio route so neither drifts from the other. */
+const SUBSCRIPTION_TIMEOUT_MS = 3e5;
+/**
 * Credential references resolved through the DSH Credentials service (BYOK).
 * These are POSIX-style reference names, not environment variables: the host
 * layers the process environment and its managed store behind them, so a name
@@ -6068,6 +6077,33 @@ const DEFAULT_ZHIPU_BASE_URL = "https://open.bigmodel.cn/api/paas/v4";
 const DEFAULT_COMFYUI_BASE_URL = "http://127.0.0.1:8188";
 const DEFAULT_COMFYUI_TIMEOUT_MS = 3e5;
 const DEFAULT_COMFYUI_WORKFLOW_LABEL = "API workflow";
+/** Content types Ark's Seedream endpoint can return. */
+const ARK_OUTPUT_FORMATS = ["png", "jpeg"];
+/** Whether Ark stamps an "AI generated" watermark on the result. */
+const ARK_BACKGROUND_MODES = ["opaque", "transparent"];
+/**
+* Map the Ark output controls onto request-body fields.
+*
+* `background` is opt-in per call site because Ark restricts `transparent` to
+* image-to-image with a single alpha-bearing reference and rejects the whole
+* request otherwise:
+*
+*   text-to-image + transparent → 400 InvalidParameter
+*     "transparent background requires exactly one input image"
+*
+* So the generation endpoint must never carry it, and that caller passes
+* `{ background: false }`. `background: opaque` is never emitted anywhere: it
+* is already Ark's default, so sending it would change nothing while adding a
+* field only the edit path can act on.
+*/
+function arkOutputBody(options, { background = true } = {}) {
+	if (options === void 0) return {};
+	const body = {};
+	if (options.outputFormat !== void 0) body.output_format = options.outputFormat;
+	if (options.watermark !== void 0) body.watermark = options.watermark;
+	if (background && options.background === "transparent") body.background = "transparent";
+	return body;
+}
 /** Default model names. */
 const DEFAULT_GOOGLE_MODEL = "gemini-3.1-flash-image";
 const DEFAULT_OPENAI_MODEL = "gpt-image-2";
@@ -6161,6 +6197,9 @@ const Config = z.object({
 	openaiCompatEditExtra: z.dict(z.any()).default({}),
 	seedreamBaseURL: z.string().default(DEFAULT_SEEDREAM_BASE_URL),
 	seedreamModel: z.string().default(DEFAULT_SEEDREAM_MODEL),
+	seedreamOutputFormat: z.union(ARK_OUTPUT_FORMATS).default("jpeg"),
+	seedreamWatermark: z.boolean().default(true),
+	seedreamBackground: z.union(ARK_BACKGROUND_MODES).default("opaque"),
 	dashscopeEndpoint: z.string().default(DEFAULT_DASHSCOPE_ENDPOINT),
 	dashscopeModel: z.string().default(DEFAULT_DASHSCOPE_MODEL),
 	xaiBaseURL: z.string().default(DEFAULT_XAI_BASE_URL),
@@ -6205,13 +6244,21 @@ function resolveProvider(config) {
 				editExtra: config.openaiCompatEditExtra ?? {}
 			};
 		}
-		case "seedream": return {
-			provider: "seedream",
-			apiKeyEnv: SEEDREAM_API_KEY_ENV,
-			model: config.seedreamModel ?? "doubao-seedream-5-0-260128",
-			baseURL: config.seedreamBaseURL ?? "https://ark.cn-beijing.volces.com/api/v3",
-			imageSize: "2K"
-		};
+		case "seedream": {
+			const seedreamBackground = config.seedreamBackground ?? "opaque";
+			return {
+				provider: "seedream",
+				apiKeyEnv: SEEDREAM_API_KEY_ENV,
+				model: config.seedreamModel ?? "doubao-seedream-5-0-260128",
+				baseURL: config.seedreamBaseURL ?? "https://ark.cn-beijing.volces.com/api/v3",
+				imageSize: "2K",
+				arkOptions: {
+					outputFormat: seedreamBackground === "transparent" ? "png" : config.seedreamOutputFormat ?? "jpeg",
+					watermark: config.seedreamWatermark ?? true,
+					background: seedreamBackground
+				}
+			};
+		}
 		case "dashscope": return {
 			provider: "dashscope",
 			apiKeyEnv: DASHSCOPE_API_KEY_ENV,
@@ -7510,7 +7557,7 @@ async function editDashScopeImage(options) {
 			model: options.model,
 			input: { messages: [{
 				role: "user",
-				content: [...options.sourceImages.map((sourceImage) => ({ image: toDataUrl$2(sourceImage) })), { text: options.prompt }]
+				content: [...options.sourceImages.map((sourceImage) => ({ image: toDataUrl$3(sourceImage) })), { text: options.prompt }]
 			}] },
 			parameters: {
 				prompt_extend: true,
@@ -7527,7 +7574,7 @@ function formatSize(size) {
 	if (size === void 0 || size.length === 0) return void 0;
 	return size.replace("x", "*");
 }
-function toDataUrl$2(image) {
+function toDataUrl$3(image) {
 	return `data:${image.mediaType};base64,${Buffer.from(image.data).toString("base64")}`;
 }
 async function requestQwenImage(options) {
@@ -8109,7 +8156,10 @@ async function generateOpenAICompatibleImage(input) {
 			model: input.model,
 			prompt: input.prompt,
 			size: input.size,
-			...input.provider === "seedream" ? { response_format: "url" } : {}
+			...input.provider === "seedream" ? {
+				response_format: "url",
+				...arkOutputBody(input.arkOptions, { background: false })
+			} : {}
 		})
 	}), input.provider, input);
 }
@@ -8117,7 +8167,7 @@ async function editOpenAICompatibleImage(input) {
 	if (input.editFormat === "jsonImageUrlArray") {
 		const body = {
 			model: input.model,
-			images: input.sourceImages.map((sourceImage) => ({ image_url: toDataUrl$1(sourceImage) })),
+			images: input.sourceImages.map((sourceImage) => ({ image_url: toDataUrl$2(sourceImage) })),
 			prompt: input.prompt,
 			n: 1,
 			size: "auto",
@@ -8178,7 +8228,7 @@ function imageEndpoint$1(baseURL, operation) {
 		throw new Error("Image endpoint must be an absolute URL");
 	}
 }
-function toDataUrl$1(image) {
+function toDataUrl$2(image) {
 	return `data:${image.mediaType};base64,${Buffer.from(image.data).toString("base64")}`;
 }
 function firstImage$1(value) {
@@ -8295,8 +8345,9 @@ async function editSeedreamImage(input) {
 		body: JSON.stringify({
 			model: input.model,
 			prompt: input.prompt,
-			image: input.sourceImages.map(toDataUrl),
+			image: input.sourceImages.map(toDataUrl$1),
 			...input.size === void 0 || input.size.length === 0 ? {} : { size: input.size },
+			...arkOutputBody(input.arkOptions),
 			response_format: "b64_json"
 		})
 	});
@@ -8323,7 +8374,7 @@ function imageEndpoint(baseURL) {
 		throw new Error("Seedream image endpoint must be an absolute URL");
 	}
 }
-function toDataUrl(image) {
+function toDataUrl$1(image) {
 	return `data:${image.mediaType};base64,${Buffer.from(image.data).toString("base64")}`;
 }
 function firstImage(value) {
@@ -8598,6 +8649,8 @@ const CODEX_TOKEN = "https://auth.openai.com/oauth/token";
 const CODEX_SCOPE = "openid profile email offline_access api.connectors.read api.connectors.invoke";
 /** Where the ChatGPT subscription image request goes. */
 const CODEX_IMAGE_URL = "https://chatgpt.com/backend-api/codex/images/generations";
+/** Where the ChatGPT subscription image edit request goes. */
+const CODEX_IMAGE_EDIT_URL = "https://chatgpt.com/backend-api/codex/images/edits";
 /** The model served by this endpoint (probed live: gpt-image-2.5-flare works
 * on the ChatGPT internal generations route as of 2026-09-14). */
 const CODEX_IMAGE_MODEL = "gpt-image-2.5-flare";
@@ -8695,6 +8748,8 @@ const GROK_TOKEN = "https://auth.x.ai/oauth2/token";
 const GROK_SCOPE = "openid profile email offline_access grok-cli:access api:access conversations:read conversations:write";
 /** Where the Grok subscription image request goes. */
 const GROK_IMAGE_URL = "https://api.x.ai/v1/images/generations";
+/** Where the Grok subscription image edit request goes. */
+const GROK_IMAGE_EDIT_URL = "https://api.x.ai/v1/images/edits";
 /** The model served by this endpoint. */
 const GROK_IMAGE_MODEL = "grok-imagine-image-2.0";
 /** Public client id of the grok-cli; vendor-fixed redirect on 127.0.0.1:56121. */
@@ -9039,15 +9094,22 @@ function platformOf() {
 * Build the streamGenerateContent request body for one image generation.
 * Ported from the reference buildImageRequest + the wrapping envelope: no
 * tools, no systemInstruction, no thinkingConfig; responseModalities asks
-* for TEXT+IMAGE.
+* for TEXT+IMAGE. Reference images (edits) ride along as inlineData parts
+* before the text part, mirroring the reference implementation.
 */
 function antigravityImageBody(options) {
 	const imageConfig = { aspectRatio: options.aspectRatio !== void 0 && ASPECT_RATIOS.includes(options.aspectRatio) ? options.aspectRatio : "1:1" };
 	if (options.hd === true) imageConfig.imageSize = "4K";
+	const parts = [];
+	for (const image of options.referenceImages ?? []) parts.push({ inlineData: {
+		mimeType: image.mediaType,
+		data: Buffer.from(image.data).toString("base64")
+	} });
+	parts.push({ text: options.prompt });
 	return {
 		contents: [{
 			role: "user",
-			parts: [{ text: options.prompt }]
+			parts
 		}],
 		generationConfig: {
 			candidateCount: 1,
@@ -9081,7 +9143,8 @@ async function antigravityGenerateImage(options) {
 	const inner = antigravityImageBody({
 		prompt: options.prompt,
 		...options.aspectRatio !== void 0 ? { aspectRatio: options.aspectRatio } : {},
-		...options.hd !== void 0 ? { hd: options.hd } : {}
+		...options.hd !== void 0 ? { hd: options.hd } : {},
+		...options.referenceImages !== void 0 ? { referenceImages: options.referenceImages } : {}
 	});
 	const body = antigravityEnvelope(options.projectId, inner);
 	let lastError = "no endpoint succeeded";
@@ -9296,6 +9359,8 @@ var SubscriptionManager = class {
 		const session = await this.ensureFresh(vendor);
 		const text = prompt.trim();
 		if (text.length === 0) throw new Error("prompt must be a non-empty string");
+		const references = options.referenceImages ?? [];
+		if (references.length > 5) throw new Error(`订阅生图最多支持 ${String(5)} 张参考图，当前 ${String(references.length)} 张`);
 		if (vendor === "antigravity") {
 			const projectId = await this.ensureAntigravityProject(session);
 			const aspectRatio = antigravityAspectRatioOf(options.size);
@@ -9305,6 +9370,7 @@ var SubscriptionManager = class {
 				prompt: text,
 				...aspectRatio !== void 0 ? { aspectRatio } : {},
 				hd: options.quality === "hd" || options.quality === "high",
+				...references.length > 0 ? { referenceImages: references } : {},
 				...options.signal !== void 0 ? { signal: options.signal } : {}
 			})).b64 }];
 		}
@@ -9312,16 +9378,17 @@ var SubscriptionManager = class {
 		let headers;
 		let body;
 		if (vendor === "codex") {
-			url = CODEX_IMAGE_URL;
+			url = references.length > 0 ? CODEX_IMAGE_EDIT_URL : CODEX_IMAGE_URL;
 			headers = codexIdentityHeaders(session);
 			body = {
 				prompt: text,
 				model: CODEX_IMAGE_MODEL,
+				...references.length > 0 ? { images: references.map((image) => ({ image_url: toDataUrl(image) })) } : {},
 				...options.size !== void 0 && options.size.length > 0 ? { size: options.size } : {},
 				...options.quality !== void 0 && options.quality.length > 0 ? { quality: options.quality } : {}
 			};
 		} else {
-			url = GROK_IMAGE_URL;
+			url = references.length > 0 ? GROK_IMAGE_EDIT_URL : GROK_IMAGE_URL;
 			headers = grokIdentityHeaders(session);
 			const aspect = {
 				"1024x1024": "1:1",
@@ -9334,6 +9401,10 @@ var SubscriptionManager = class {
 				prompt: text,
 				model: GROK_IMAGE_MODEL,
 				response_format: "b64_json",
+				...references.length > 0 ? { images: references.map((image) => ({
+					type: "image_url",
+					image_url: toDataUrl(image)
+				})) } : {},
 				...options.size !== void 0 && aspect[options.size] !== void 0 ? { aspect_ratio: aspect[options.size] } : {},
 				...level !== void 0 ? { quality: level } : {}
 			};
@@ -9380,6 +9451,10 @@ function antigravityAspectRatioOf(size) {
 	if (mapped !== void 0) return mapped;
 	return /^\d+:\d+$/.test(size) ? size : "1:1";
 }
+/** Encode one reference image as the data URL the edit endpoints accept. */
+function toDataUrl(image) {
+	return `data:${image.mediaType};base64,${Buffer.from(image.data).toString("base64")}`;
+}
 /** Response parsing: both vendors reply in the same `{data:[{b64_json}]}` shape. */
 function parseImages(payload) {
 	const body = typeof payload === "object" && payload !== null ? payload : {};
@@ -9524,20 +9599,21 @@ function jsonError$3(res, status, code) {
 }
 //#endregion
 //#region lib/types/subscription.js
-/** Timeout for one subscription image call, mirroring the other adapters. */
-const SUBSCRIPTION_TIMEOUT_MS = 3e5;
 /**
 * Generate one image through a logged-in subscription account. Returns the
 * same `{ data, mediaType }` contract as the API-key adapters so the caller
-* can feed it straight into `saveGenerated`.
+* can feed it straight into `saveGenerated`. With sourceImages the call is
+* an edit: the vendor layer picks the channel's edit endpoint.
 */
 async function generateSubscriptionImage(options) {
 	const { manager, provider, prompt, maxBytes, signal } = options;
 	const size = options.size?.trim();
+	const sourceImages = options.sourceImages ?? [];
 	const result = await withTimeout(manager.generate({
 		vendor: vendorOf(provider),
 		prompt,
 		...size !== void 0 && size.length > 0 ? { size } : {},
+		...sourceImages.length > 0 ? { referenceImages: sourceImages } : {},
 		signal
 	}), signal);
 	const first = Array.isArray(result) ? result[0] : void 0;
@@ -9552,10 +9628,6 @@ async function generateSubscriptionImage(options) {
 		...typeof first.revisedPrompt === "string" && first.revisedPrompt.length > 0 ? { revisedPrompt: first.revisedPrompt } : {}
 	};
 }
-/** Subscription channels are prompt-only today; edit_image is rejected outright. */
-function assertSubscriptionEditUnsupported(provider) {
-	throw new Error(`edit_image with ${SUBSCRIPTION_PROVIDER_DISPLAY_NAMES[provider]} is not supported yet: the subscription channel only accepts text prompts. Retry with an API-key provider (for example google or openai) through the provider argument.`);
-}
 /** Run one promise with the subscription timeout and the call's abort signal. */
 async function withTimeout(promise, signal) {
 	let timer;
@@ -20467,24 +20539,63 @@ const RATIO_LABELS = {
 	"9:16": "9:16 竖屏"
 };
 /** Return only browser-safe capability data. */
-async function describeStudio(ctx, config) {
+async function describeStudio(ctx, config, subscriptions) {
 	const configuredEntries = await Promise.all(CLOUD_IMAGE_PROVIDERS.map(async (provider) => {
 		return [provider, await resolveApiKey(ctx, provider) !== void 0];
 	}));
 	const configured = Object.fromEntries(configuredEntries);
-	const profiles = CLOUD_IMAGE_PROVIDERS.map((provider) => studioProfile(config, provider, configured[provider]));
+	const cloudProfiles = CLOUD_IMAGE_PROVIDERS.map((provider) => studioProfile(config, provider, configured[provider]));
+	const subStatuses = await Promise.all(SUBSCRIPTION_PROVIDERS.map(async (provider) => {
+		return [provider, subscriptions !== void 0 && (await subscriptions.loginStatus(vendorOf(provider))).state === "logged-in"];
+	}));
+	const subProfiles = SUBSCRIPTION_PROVIDERS.map((provider) => {
+		return subscriptionStudioProfile(provider, subStatuses.find((entry) => entry[0] === provider)?.[1] === true);
+	});
+	const profiles = [...cloudProfiles, ...subProfiles];
 	const preferred = config.provider;
 	return {
 		providers: profiles,
-		activeProvider: preferred !== void 0 && cloudProvider$1(preferred) ? preferred : profiles.find((profile) => profile.configured)?.provider ?? "google"
+		activeProvider: isStudioPreferred(preferred) ? preferred : profiles.find((profile) => profile.configured)?.provider ?? "google"
+	};
+}
+/** The persisted default provider is usable directly when the workbench can drive it. */
+function isStudioPreferred(preferred) {
+	return preferred !== void 0 && CLOUD_IMAGE_PROVIDERS.includes(preferred) || preferred !== void 0 && SUBSCRIPTION_PROVIDERS.includes(preferred);
+}
+/** Fixed parameter shape for subscription channels: one "channel default" pair. */
+function subscriptionStudioProfile(provider, signedIn) {
+	const channelDefault = {
+		value: "auto",
+		label: "通道默认"
+	};
+	return {
+		provider,
+		label: SUBSCRIPTION_DISPLAY_LABELS[provider],
+		model: DEFAULT_SUBSCRIPTION_MODELS[provider],
+		configured: signedIn,
+		supportsEditing: true,
+		ratioOptions: [channelDefault],
+		qualityOptions: [channelDefault],
+		defaultRatio: "auto",
+		defaultQuality: "auto"
 	};
 }
+/** Short display names for the workbench subscription rows. */
+const SUBSCRIPTION_DISPLAY_LABELS = {
+	"chatgpt-sub": "ChatGPT 订阅",
+	"grok-sub": "Grok 订阅",
+	"google-sub": "Google 订阅"
+};
 /** Execute one validated browser workbench request using the existing provider adapters. */
-async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceRoot) {
+async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceRoot, subscriptions) {
+	if (isSubscriptionProvider(input.provider)) {
+		if (subscriptions === void 0) throw new Error("订阅生图不可用：订阅管理器未初始化");
+		assertAllowed(subscriptionStudioProfile(input.provider, true), input);
+		return generateSubscriptionFromStudio(ctx, subscriptions, input, signal);
+	}
 	assertAllowed(studioProfile(config, input.provider, true), input);
 	const active = resolveProvider(withProviderOverrides(config, input.provider, input.model));
 	if (active.provider === "comfyui") throw new Error("ComfyUI 暂未接入工作台");
-	if (isSubscriptionProvider(active.provider)) throw new Error("订阅生图暂未接入工作台，请通过对话或设置切换默认 Provider 使用");
 	const wired = active;
 	const credential = await requireApiKey(ctx, input.provider);
 	const rawRefs = input.references ?? (input.reference ? [input.reference] : []);
@@ -20555,7 +20666,8 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				sourceImages,
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-				signal
+				signal,
+				arkOptions: wired.arkOptions
 			}) : await generateOpenAICompatibleImage({
 				provider: "seedream",
 				apiKey: credential,
@@ -20564,7 +20676,8 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 				prompt: input.prompt,
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-				signal
+				signal,
+				arkOptions: wired.arkOptions
 			});
 			output = size;
 		} else {
@@ -20672,6 +20785,76 @@ async function runPool(tasks, concurrency = 2) {
 	await Promise.all(workers);
 	return results;
 }
+/**
+* Subscription workbench generation: one prompt, channel-default parameters,
+* through the shared generateSubscriptionImage wrapper (timeout, b64 decode,
+* size check) so the downstream attachment flow is identical to API keys.
+*/
+async function generateSubscriptionFromStudio(ctx, subscriptions, input, signal) {
+	const provider = input.provider;
+	const rawRefs = input.references ?? (input.reference ? [input.reference] : []);
+	if (input.mode === "edit" && rawRefs.length === 0) throw new Error("图生图需要至少一张参考图");
+	const sourceImages = input.mode === "edit" ? await Promise.all(rawRefs.map((ref) => readStudioReference(ctx, ref, signal))) : [];
+	const startedAt = Date.now();
+	const count = input.count ?? 1;
+	const generateSingle = async (index) => {
+		const generated = await generateSubscriptionImage({
+			manager: subscriptions,
+			provider,
+			prompt: input.prompt,
+			...sourceImages.length > 0 ? { sourceImages } : {},
+			maxBytes: ctx.attachments.imageLimits.maxImageBytes,
+			signal
+		});
+		if (!ctx.attachments.imageLimits.mediaTypes.includes(generated.mediaType)) throw new Error(`当前 DSH 不支持保存 ${generated.mediaType} 图片`);
+		return {
+			attachment: await ctx.attachments.saveImage({
+				data: generated.data,
+				mediaType: generated.mediaType,
+				name: count > 1 ? `studio-image-${index + 1}` : "studio-image"
+			}),
+			output: "通道默认"
+		};
+	};
+	if (count === 1) {
+		const single = await generateSingle(0);
+		return subscriptionResponse(input, startedAt, 1, 0, [single], single);
+	}
+	const poolResults = await runPool(Array.from({ length: count }, (_, i) => () => generateSingle(i)), 2);
+	const successes = [];
+	const errors = [];
+	for (let i = 0; i < poolResults.length; i++) {
+		const r = poolResults[i];
+		if (r.status === "fulfilled") successes.push(r.value);
+		else errors.push({
+			index: i,
+			message: r.reason instanceof Error ? r.reason.message : String(r.reason)
+		});
+	}
+	if (successes.length === 0) {
+		const firstReason = poolResults[0] && poolResults[0].status === "rejected" ? poolResults[0].reason : /* @__PURE__ */ new Error("订阅生图全部失败");
+		throw firstReason instanceof Error ? firstReason : new Error(String(firstReason));
+	}
+	const first = successes[0];
+	return subscriptionResponse(input, startedAt, count, errors.length, successes, first, errors);
+}
+/** Assemble the subscription workbench response with exactOptionalPropertyTypes-safe spreads. */
+function subscriptionResponse(input, startedAt, requestedCount, failedCount, items, primary, errors) {
+	return {
+		attachment: primary.attachment,
+		output: primary.output,
+		provider: input.provider,
+		model: input.model,
+		prompt: input.prompt,
+		createdAt: Date.now(),
+		elapsedMs: Date.now() - startedAt,
+		requestedCount,
+		failedCount,
+		items,
+		...primary.savedTo ? { savedTo: primary.savedTo } : {},
+		...errors !== void 0 && errors.length > 0 ? { errors } : {}
+	};
+}
 function studioProfile(config, provider, configured) {
 	let active;
 	try {
@@ -20725,7 +20908,7 @@ function studioProfile(config, provider, configured) {
 function profile(provider, model, configured, ratioOptions, qualityOptions, defaultRatio, defaultQuality) {
 	return {
 		provider,
-		label: PROVIDER_DISPLAY_NAMES[provider],
+		label: CLOUD_DISPLAY_LABELS[provider],
 		model,
 		configured,
 		supportsEditing: true,
@@ -20735,6 +20918,16 @@ function profile(provider, model, configured, ratioOptions, qualityOptions, defa
 		defaultQuality
 	};
 }
+/** Display names for the BYOK cloud rows, mirroring the settings card. */
+const CLOUD_DISPLAY_LABELS = {
+	google: "Google Gemini",
+	openai: "OpenAI",
+	"openai-compat": "OpenAI 兼容",
+	seedream: "Seedream",
+	dashscope: "DashScope",
+	xai: "xAI Grok",
+	zhipu: "智谱 GLM"
+};
 function option(value) {
 	return {
 		value,
@@ -20788,9 +20981,6 @@ function dashScopeSize(ratio) {
 		"9:16": "928*1664"
 	}[ratio] ?? "1024*1024";
 }
-function cloudProvider$1(value) {
-	return CLOUD_IMAGE_PROVIDERS.includes(value);
-}
 //#endregion
 //#region lib/types/studio-route.js
 /** Serve workbench capabilities and generation requests without exposing provider credentials. */
@@ -20804,8 +20994,10 @@ async function serveStudio(req, res, deps) {
 	if (req.method !== "POST") return jsonError$1(res, 405, "method-not-allowed");
 	if (!(req.headers["content-type"] ?? "").toLowerCase().startsWith("application/json")) return jsonError$1(res, 415, "json-required");
 	const controller = new AbortController();
-	const upstreamTimeout = AbortSignal.timeout(15e4);
-	const signal = AbortSignal.any([controller.signal, upstreamTimeout]);
+	const watchdog = new AbortController();
+	const CLOUD_WATCHDOG_MS = 15e4;
+	let subscriptionChannel = false;
+	const signal = AbortSignal.any([controller.signal, watchdog.signal]);
 	const onConnectionClose = () => {
 		if (!res.writableEnded) controller.abort(/* @__PURE__ */ new Error("The browser closed the image generation request."));
 	};
@@ -20821,11 +21013,15 @@ async function serveStudio(req, res, deps) {
 		} catch (error) {
 			return jsonError$1(res, 400, errorMessage(error, "invalid-request"));
 		}
+		subscriptionChannel = isSubscriptionProvider(input.provider);
+		setTimeout(() => {
+			watchdog.abort();
+		}, subscriptionChannel ? SUBSCRIPTION_TIMEOUT_MS : CLOUD_WATCHDOG_MS).unref?.();
 		const output = await deps.generate(input, signal);
 		if (!res.headersSent && !res.writableEnded && !res.destroyed) json$1(res, 200, output);
 	} catch (error) {
 		if (res.headersSent || res.writableEnded || res.destroyed) return;
-		if (upstreamTimeout.aborted) return jsonError$1(res, 504, "上游生成超时（150 秒未返回），请检查网络或代理后重试");
+		if (watchdog.signal.aborted) return jsonError$1(res, 504, subscriptionChannel ? "上游生成超时（订阅通道 300 秒未返回），请稍后重试" : "上游生成超时（150 秒未返回），请检查网络或代理后重试");
 		jsonError$1(res, controller.signal.aborted ? 499 : 502, errorMessage(error, "generation-failed"));
 	} finally {
 		res.off("close", onConnectionClose);
@@ -20837,7 +21033,7 @@ function parseStudioGenerateRequest(value) {
 	const input = record$1(value);
 	if (input === void 0) throw new Error("请求格式无效");
 	if (input.mode !== "generate" && input.mode !== "edit") throw new Error("请选择生成类型");
-	if (!cloudProvider(input.provider)) throw new Error("不支持该图像 Provider");
+	if (!studioProvider(input.provider)) throw new Error("不支持该图像 Provider");
 	const prompt = requiredText(input.prompt, "请输入提示词", 2e3);
 	const model = requiredText(input.model, "请选择模型", 200);
 	const ratio = requiredText(input.ratio, "请选择比例", 32);
@@ -20889,8 +21085,8 @@ function requiredText(value, message, maxLength) {
 	if (text.length > maxLength) throw new Error(`${message}（最多 ${String(maxLength)} 个字符）`);
 	return text;
 }
-function cloudProvider(value) {
-	return typeof value === "string" && CLOUD_IMAGE_PROVIDERS.includes(value);
+function studioProvider(value) {
+	return typeof value === "string" && STUDIO_PROVIDERS.includes(value);
 }
 function imageMediaType(value) {
 	return value === "image/png" || value === "image/jpeg" || value === "image/webp" || value === "image/gif";
@@ -21386,7 +21582,7 @@ function apply(ctx, config = {}) {
 		path: STUDIO_ROUTE,
 		handler: (req, res) => serveStudio(req, res, {
 			describe: async () => {
-				const base = await describeStudio(ctx, current());
+				const base = await describeStudio(ctx, current(), subscriptionManager);
 				const workspaces = await getDshWorkspacesFull().catch(() => []);
 				const activeRoot = Array.from(knownWorkspaceRoots)[0] || workspaces[0]?.path || process.cwd();
 				return {
@@ -21397,7 +21593,7 @@ function apply(ctx, config = {}) {
 			},
 			generate: (input, signal) => {
 				const fallbackRoot = Array.from(knownWorkspaceRoots)[0] || process.cwd();
-				return generateFromStudio(ctx, current(), input, signal, fallbackRoot);
+				return generateFromStudio(ctx, current(), input, signal, fallbackRoot, subscriptionManager);
 			},
 			maxBodyBytes: Math.ceil(ctx.attachments.imageLimits.maxImageBytes * 1.4 * 5) + 262144
 		})
@@ -21523,6 +21719,7 @@ function apply(ctx, config = {}) {
 				}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 			}
 			const size = args.size ?? active.imageSize;
+			const arkOptions = active.provider === "seedream" ? active.arkOptions : void 0;
 			return saveGenerated(ctx, await generateOpenAICompatibleImage({
 				provider: active.provider,
 				apiKey: credential,
@@ -21531,7 +21728,8 @@ function apply(ctx, config = {}) {
 				prompt: args.prompt,
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-				signal: exec.signal
+				signal: exec.signal,
+				...arkOptions === void 0 ? {} : { arkOptions }
 			}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 		},
 		presentResult: (_args, result) => imagePresentation(result)
@@ -21560,7 +21758,7 @@ function apply(ctx, config = {}) {
 					"grok-sub",
 					"google-sub"
 				],
-				description: "Optional provider for this call only (for example when the user asks to use a specific provider); omit to use the configured default. chatgpt-sub, grok-sub, and google-sub cannot edit images yet; the subscription channel is text-prompt only, so retry editing with an API-key provider instead."
+				description: "Optional provider for this call only (for example when the user asks to use a specific provider); omit to use the configured default. chatgpt-sub, grok-sub, and google-sub edit images through the logged-in subscription account instead of an API key."
 			},
 			model: {
 				type: "string",
@@ -21623,7 +21821,6 @@ function apply(ctx, config = {}) {
 		output: imageOutput("Edited"),
 		async execute(args, exec) {
 			const active = resolveProvider(withProviderOverrides(current(), providerOverrideOf(args.provider), args.model));
-			if (active.provider === "chatgpt-sub" || active.provider === "grok-sub" || active.provider === "google-sub") assertSubscriptionEditUnsupported(active.provider);
 			const canvasSelection = args.source === "canvas_selection";
 			if (canvasSelection && (args.source_attachment_id !== void 0 || Array.isArray(args.source_attachment_ids) || args.source_path !== void 0 || Array.isArray(args.source_paths))) throw new Error("edit_image source=canvas_selection cannot be combined with source_attachment_id, source_attachment_ids, source_path, or source_paths; provide exactly one selector");
 			const sourceImages = canvasSelection ? await resolveCanvasSelectionReferences({
@@ -21660,6 +21857,18 @@ function apply(ctx, config = {}) {
 					signal: exec.signal
 				}), active.provider, workflow.name, "API workflow", current(), exec, knownWorkspaceRoots);
 			}
+			if (active.provider === "chatgpt-sub" || active.provider === "grok-sub" || active.provider === "google-sub") {
+				if (sourceImages.length === 0) throw new Error("edit_image requires a reference image");
+				return saveGenerated(ctx, await generateSubscriptionImage({
+					manager: subscriptionManager,
+					provider: active.provider,
+					prompt: args.prompt,
+					sourceImages,
+					...args.size !== void 0 ? { size: args.size } : {},
+					maxBytes: ctx.attachments.imageLimits.maxImageBytes,
+					signal: exec.signal
+				}), active.provider, active.model, "subscription edit", current(), exec, knownWorkspaceRoots);
+			}
 			const credential = await requireApiKey(ctx, active.provider, "edit_image");
 			if (active.provider === "google") {
 				const aspectRatio = args.aspect_ratio ?? active.aspectRatio;
@@ -21699,7 +21908,8 @@ function apply(ctx, config = {}) {
 				sourceImages,
 				size,
 				maxBytes: ctx.attachments.imageLimits.maxImageBytes,
-				signal: exec.signal
+				signal: exec.signal,
+				arkOptions: active.arkOptions
 			}), active.provider, active.model, size, current(), exec, knownWorkspaceRoots);
 			return saveGenerated(ctx, await editDashScopeImage({
 				apiKey: credential,

package/lib/types/client/conversation-image-revisions.d.ts

@@ -1,10 +1,10 @@
 import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment';
-import { type CloudImageProvider } from '../shared.js';
+import { type StudioProvider } from '../shared.js';
 /** One regenerated version displayed in place of an original conversation image. */
 export interface ConversationImageRevision {
     attachment: ImageAttachmentRef;
     prompt: string;
-    provider: CloudImageProvider;
+    provider: StudioProvider;
     model: string;
     output: string;
     createdAt: number;

package/lib/types/client/gallery-view.d.ts

@@ -192,6 +192,10 @@ export interface GalleryViewTabProps {
     useSession?: (selector: (state: any) => any) => any;
     useSessions?: (selector: (state: any) => any) => any;
     useWorkspaces?: (selector: (state: any) => any) => any;
+    /** Host credential-change notifier; forwarded to the studio workbench. */
+    credentialEvents?: {
+        listen(callback: () => void): () => void;
+    } | undefined;
     /**
      * Right-sidebar variant (DSH official `sidebar.right.pane.tab` seat). The
      * native conversation stays in the main area, so the composer must NOT be