dsh-image-gen 0.9.1 → 0.9.3

package/lib/index.js

@@ -5604,7 +5604,7 @@ function configuredField(extra) {
 }
 /** Model names alone do not establish the protocol of an unknown relay. */
 function officialContract(config, mode) {
-	const model = (mode === "generate" ? config.openaiCompatExtraBody : config.openaiCompatEditExtra)?.model ?? config.openaiCompatModel;
+	const model = (mode === "generate" ? config.openaiCompatExtraBody : config.openaiCompatEditExtra)?.model ?? (mode === "edit" ? config.openaiCompatEditModel?.trim() || config.openaiCompatModel : config.openaiCompatModel);
 	if (typeof model !== "string") return void 0;
 	try {
 		const url = new URL(config.openaiCompatBaseURL ?? "");
@@ -5616,6 +5616,10 @@ function officialContract(config, mode) {
 }
 /** Known official edit contracts take precedence over relay-specific format settings. */
 function compatEditFormat(config) {
+	try {
+		const url = new URL(config.openaiCompatBaseURL ?? "");
+		if (url.protocol === "https:" && !url.port && !url.search && !url.hash && (url.hostname === "api.siliconflow.cn" || url.hostname === "api.siliconflow.com") && url.pathname.replace(/\/+$/, "") === "/v1") return "siliconflowJson";
+	} catch {}
 	const contract = officialContract(config, "edit");
 	if (contract === "sensenova") return "jsonImageUrlArray";
 	if (contract === "qwen") return "qwenJson";
@@ -5827,6 +5831,10 @@ const STUDIO_WATERMARK_VALUES = [
 	"off",
 	"on"
 ];
+/** A model picker/request must use the same operation-specific default. */
+function studioModelForMode(profile, mode) {
+	return mode === "edit" ? profile.editModel ?? profile.model : profile.model;
+}
 function studioWatermarkCapability(profile, mode) {
 	return profile?.watermarkCapabilities?.[mode] ?? (mode === "generate" && profile?.watermarkOptions?.length ? { status: "supported" } : {
 		status: "unknown",
@@ -5955,11 +5963,13 @@ const Config = z.object({
 	provider: volatile(z.union(IMAGE_PROVIDERS).default("google")),
 	googleModel: volatile(z.string().default(DEFAULT_GOOGLE_MODEL)),
 	googleEndpoint: volatile(z.string().default(DEFAULT_GOOGLE_ENDPOINT)),
+	googleNative: volatile(z.boolean().default(false)),
 	openaiBaseURL: volatile(z.string().default(DEFAULT_OPENAI_BASE_URL)),
 	openaiModel: volatile(z.string().default(DEFAULT_OPENAI_MODEL)),
 	openaiSizes: volatile(z.dict(z.dict(z.string())).default({})),
 	openaiCompatBaseURL: volatile(z.string().default("")),
 	openaiCompatModel: volatile(z.string().default("")),
+	openaiCompatEditModel: volatile(z.string().default("")),
 	openaiCompatQuality: volatile(z.string().default("")),
 	openaiCompatQualityOptions: volatile(z.array(z.string()).default([
 		"auto",
@@ -5972,7 +5982,8 @@ const Config = z.object({
 	openaiCompatEditFormat: volatile(z.union([
 		z.const("multipart"),
 		z.const("jsonImageUrlArray"),
-		z.const("formReferenceImages")
+		z.const("formReferenceImages"),
+		z.const("siliconflowJson")
 	]).default("multipart")),
 	openaiCompatEditExtra: volatile(z.dict(z.any()).default({})),
 	openaiCompatSizes: volatile(z.dict(z.dict(z.string())).default({})),
@@ -6090,6 +6101,7 @@ function resolveProvider(config) {
 			apiKeyEnv: GOOGLE_API_KEY_ENV,
 			model: config.googleModel ?? "gemini-3.1-flash-image",
 			endpoint: config.googleEndpoint ?? "https://generativelanguage.googleapis.com/v1beta/interactions",
+			native: config.googleNative === true,
 			aspectRatio: "1:1",
 			imageSize: "1K"
 		};
@@ -6099,13 +6111,12 @@ function resolveProvider(config) {
 * Apply a per-call provider and/or model override on top of the saved config.
 * `model` is ignored for ComfyUI, whose per-call equivalent is `workflow`.
 */
-function withProviderOverrides(config, provider, model) {
+function withProviderOverrides(config, provider, model, mode = "generate") {
 	const base = provider === void 0 ? { ...config } : {
 		...config,
 		provider
 	};
-	if (model === void 0) return base;
-	const trimmed = model.trim();
+	const trimmed = model?.trim() || (mode === "edit" && base.provider === "openai-compat" ? base.openaiCompatEditModel?.trim() : "") || "";
 	if (trimmed.length === 0) return base;
 	switch (base.provider ?? "google") {
 		case "google": return {
@@ -6118,7 +6129,8 @@ function withProviderOverrides(config, provider, model) {
 		};
 		case "openai-compat": return {
 			...base,
-			openaiCompatModel: trimmed
+			openaiCompatModel: trimmed,
+			...mode === "edit" ? { openaiCompatEditModel: trimmed } : {}
 		};
 		case "seedream": return {
 			...base,
@@ -7563,12 +7575,13 @@ function generateGoogleImage(input) {
 	return requestGoogleImage({
 		...input,
 		operation: "generation",
-		interactionInput: input.prompt
+		interactionInput: input.prompt,
+		nativeParts: [{ text: input.prompt }]
 	});
 }
 /** Send one native Google image-editing request using already-resolved bytes. */
 function editGoogleImage(input) {
-	const interactionInput = input.sourceImages.length === 1 ? [{
+	const interactionInput = input.native ? [] : input.sourceImages.length === 1 ? [{
 		type: "image",
 		mime_type: input.sourceImages[0].mediaType,
 		data: Buffer.from(input.sourceImages[0].data).toString("base64")
@@ -7589,13 +7602,41 @@ function editGoogleImage(input) {
 	return requestGoogleImage({
 		...input,
 		operation: "editing",
-		interactionInput
+		interactionInput,
+		nativeParts: input.native ? [...input.sourceImages.map((image) => ({ inlineData: {
+			mimeType: image.mediaType,
+			data: Buffer.from(image.data).toString("base64")
+		} })), { text: input.prompt }] : []
 	});
 }
 /** Shared Google request, response parsing, decoding, and size enforcement. */
 async function requestGoogleImage(input) {
 	const label = `Google image ${input.operation}`;
-	const response = await guardedFetch(`${label} request`, input.signal, () => fetch(input.endpoint, {
+	const endpoint = input.native ? nativeGoogleUrl(input.endpoint, input.model).toString() : input.endpoint;
+	const body = input.native ? {
+		contents: [{
+			role: "user",
+			parts: input.nativeParts
+		}],
+		generationConfig: {
+			candidateCount: 1,
+			responseModalities: ["TEXT", "IMAGE"],
+			imageConfig: {
+				aspectRatio: input.aspectRatio,
+				imageSize: input.imageSize
+			}
+		}
+	} : {
+		model: input.model,
+		input: input.interactionInput,
+		response_format: {
+			type: "image",
+			mime_type: REQUESTED_MEDIA_TYPE,
+			aspect_ratio: input.aspectRatio,
+			image_size: input.imageSize
+		}
+	};
+	const response = await guardedFetch(`${label} request`, input.signal, () => fetch(endpoint, {
 		method: "POST",
 		redirect: "error",
 		signal: input.signal,
@@ -7603,16 +7644,7 @@ async function requestGoogleImage(input) {
 			"content-type": "application/json",
 			"x-goog-api-key": input.apiKey
 		},
-		body: JSON.stringify({
-			model: input.model,
-			input: input.interactionInput,
-			response_format: {
-				type: "image",
-				mime_type: REQUESTED_MEDIA_TYPE,
-				aspect_ratio: input.aspectRatio,
-				image_size: input.imageSize
-			}
-		})
+		body: JSON.stringify(body)
 	}), input.apiKey);
 	const text = await readBoundedText$2(response, Math.ceil(input.maxBytes * 1.4) + ERROR_LIMIT$2, label);
 	if (!response.ok) throw new Error(`${label} failed (${response.status}): ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT$2)}`);
@@ -7622,7 +7654,7 @@ async function requestGoogleImage(input) {
 	} catch {
 		throw new Error(`${label} returned invalid JSON`);
 	}
-	const image = outputImage(payload);
+	const image = input.native ? nativeOutputImage(payload) : outputImage(payload);
 	if (image === void 0) throw new Error(`${label} returned no image: ${redactSecrets(text, input.apiKey).slice(0, ERROR_LIMIT$2)}`);
 	const data = decodeBase64$2(image.data, label);
 	if (data.byteLength > input.maxBytes) throw new Error(`${label} exceeded the ${String(input.maxBytes)} byte image limit`);
@@ -7633,6 +7665,49 @@ async function requestGoogleImage(input) {
 		mediaType
 	};
 }
+/** Accept a versioned base, the existing interactions URL, or a full native URL. */
+function nativeGoogleUrl(endpoint, model) {
+	let url;
+	try {
+		url = new URL(endpoint);
+	} catch {
+		throw new Error("Google endpoint must be an absolute URL");
+	}
+	const base = url.pathname.replace(/\/+$/, "").replace(/\/(?:interactions|models(?:\/[^/]+:generateContent)?)$/, "");
+	url.pathname = `${base}/models${model === void 0 ? "" : `/${encodeURIComponent(model.replace(/^models\//, ""))}:generateContent`}`;
+	return url;
+}
+/** The settings probe and model picker use the same base as image requests. */
+function googleModelsEndpoint(endpoint, native) {
+	if (native) return nativeGoogleUrl(endpoint).toString();
+	let url;
+	try {
+		url = new URL(endpoint);
+	} catch {
+		throw new Error("Google endpoint must be an absolute URL");
+	}
+	const segments = url.pathname.split("/").filter(Boolean);
+	segments[segments.length - 1] = "models";
+	url.pathname = `/${segments.join("/")}`;
+	return url.toString();
+}
+function nativeOutputImage(value) {
+	const candidates = record$5(value)?.candidates;
+	if (!Array.isArray(candidates)) return void 0;
+	for (const candidate of candidates) {
+		const parts = record$5(record$5(candidate)?.content)?.parts;
+		if (!Array.isArray(parts)) continue;
+		for (const value of parts) {
+			const part = record$5(value);
+			if (part?.thought === true) continue;
+			const image = record$5(part?.inlineData ?? part?.inline_data);
+			if (typeof image?.data === "string") return {
+				data: image.data,
+				mime_type: image.mimeType ?? image.mime_type
+			};
+		}
+	}
+}
 function outputImage(value) {
 	const interaction = record$5(value);
 	if (interaction === void 0) return void 0;
@@ -8198,6 +8273,39 @@ async function generateOpenAICompatibleImage(input) {
 	}), input.apiKey), input.provider, input);
 }
 async function editOpenAICompatibleImage(input) {
+	if (input.editFormat === "siliconflowJson") {
+		const body = {
+			model: input.model,
+			prompt: input.prompt,
+			...input.editExtra ?? {},
+			...input.extraBody ?? {}
+		};
+		const model = typeof body.model === "string" ? body.model.trim() : "";
+		if (!model) throw new Error("硅基流动图生图需要编辑模型");
+		body.model = model;
+		if (model === "Qwen/Qwen-Image") throw new Error("Qwen/Qwen-Image 是文生图模型；请配置图生图模型，例如 Qwen/Qwen-Image-Edit");
+		const maxReferences = model === "Qwen/Qwen-Image-Edit-2509" ? 3 : 1;
+		if (input.sourceImages.length < 1 || input.sourceImages.length > maxReferences) throw new Error(`${model} 图生图支持 1–${String(maxReferences)} 张参考图，当前 ${String(input.sourceImages.length)} 张；请精简参考图或选择支持多图的编辑模型`);
+		if ([
+			"size",
+			"image_size",
+			"quality"
+		].some((key) => key in body)) throw new Error("此硅基流动图生图格式不发送 size、image_size 或 quality；请从图生图额外字段中移除这些字段");
+		delete body.image;
+		delete body.image2;
+		delete body.image3;
+		for (const [index, source] of input.sourceImages.entries()) body[index === 0 ? "image" : `image${String(index + 1)}`] = toDataUrl$2(source);
+		return parseImageResponse(await guardedFetch("siliconflow image edit request", input.signal, () => fetch(imageEndpoint$1(input.baseURL, "generations"), {
+			method: "POST",
+			redirect: "error",
+			signal: input.signal,
+			headers: {
+				authorization: `Bearer ${input.apiKey}`,
+				"content-type": "application/json"
+			},
+			body: JSON.stringify(body)
+		}), input.apiKey), "siliconflow", input);
+	}
 	if (input.editFormat === "qwenJson") return parseImageResponse(await guardedFetch("openai-compat image edit request", input.signal, () => fetch(imageEndpoint$1(input.baseURL, "generations"), {
 		method: "POST",
 		redirect: "error",
@@ -10093,16 +10201,18 @@ function jsonError$3(res, status, code) {
 //#region lib/types/subscription.js
 /** Translate image tool options into each subscription channel's wire inputs. */
 function subscriptionToolParameters(provider, options) {
-	if (options.size !== void 0 && options.aspectRatio !== void 0) throw new Error("size 与 aspect_ratio 请只选一个");
-	const ratio = options.aspectRatio;
+	const requestedSize = options.size?.trim() || void 0;
+	const ratio = options.aspectRatio?.trim() || void 0;
+	const imageSize = options.imageSize?.trim() || void 0;
+	if (requestedSize !== void 0 && ratio !== void 0) throw new Error("size 与 aspect_ratio 请只选一个；无关可选字段请省略，不要填写空字符串");
 	if (ratio !== void 0 && !SUBSCRIPTION_CAPABILITIES[provider].ratioOptions.some((option) => option.value === ratio)) throw new Error(`${provider} 不支持比例 ${ratio}`);
-	const size = options.size ?? (ratio === void 0 ? void 0 : provider === "chatgpt-sub" ? SUBSCRIPTION_CAPABILITIES[provider].sizeFor?.(ratio, "auto") : ratio);
+	const size = requestedSize ?? (ratio === void 0 ? void 0 : provider === "chatgpt-sub" ? SUBSCRIPTION_CAPABILITIES[provider].sizeFor?.(ratio, "auto") : ratio);
 	let quality;
-	if (options.imageSize !== void 0) {
-		if (provider === "grok-sub" && (options.imageSize === "1K" || options.imageSize === "2K")) quality = options.imageSize.toLowerCase();
-		else if (provider === "google-sub" && options.imageSize === "4K") quality = "hd";
-		else if (provider === "google-sub" && options.imageSize === "1K") quality = void 0;
-		else throw new Error(`${provider} 不支持清晰度 ${options.imageSize}`);
+	if (imageSize !== void 0) {
+		if (provider === "grok-sub" && (imageSize === "1K" || imageSize === "2K")) quality = imageSize.toLowerCase();
+		else if (provider === "google-sub" && imageSize === "4K") quality = "hd";
+		else if (provider === "google-sub" && imageSize === "1K") quality = void 0;
+		else throw new Error(`${provider} 不支持清晰度 ${imageSize}；${provider === "chatgpt-sub" ? "请省略 image_size，使用 size 或 aspect_ratio 指定尺寸" : `image_size 仅支持 ${provider === "grok-sub" ? "1K、2K" : "1K、4K"}`}`);
 	}
 	return {
 		...size === void 0 ? {} : { size },
@@ -27771,6 +27881,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 			generated = input.mode === "edit" ? await editGoogleImage({
 				apiKey: credential,
 				endpoint: wired.endpoint,
+				native: wired.native,
 				model: wired.model,
 				prompt: input.prompt,
 				sourceImages,
@@ -27781,6 +27892,7 @@ async function generateFromStudio(ctx, config, input, signal, fallbackWorkspaceR
 			}) : await generateGoogleImage({
 				apiKey: credential,
 				endpoint: wired.endpoint,
+				native: wired.native,
 				model: wired.model,
 				prompt: input.prompt,
 				aspectRatio,
@@ -28055,8 +28167,10 @@ function subscriptionResponse(input, startedAt, requestedCount, failedCount, ite
 }
 function studioProfile(config, provider, configured) {
 	const result = cloudStudioProfile(config, provider, configured);
+	const editModel = provider === "openai-compat" ? config.openaiCompatEditModel?.trim() : void 0;
 	return {
 		...result,
+		...editModel ? { editModel } : {},
 		...watermarkProfile(config, provider, result.model)
 	};
 }
@@ -28154,7 +28268,7 @@ function option(value) {
 	};
 }
 function assertAllowed(profile, input) {
-	if (input.model !== profile.model) throw new Error("模型配置已变化，请刷新工作台后重试");
+	if (input.model !== studioModelForMode(profile, input.mode)) throw new Error("模型配置已变化，请刷新工作台后重试");
 	if (!profile.ratioOptions.some((option) => option.value === input.ratio)) throw new Error("该 Provider 不支持所选比例");
 	const selectedQuality = input.provider === "openai" ? input.generationQuality ?? input.quality : input.resolution ?? input.quality;
 	if (!profile.qualityOptions.some((option) => option.value === selectedQuality)) throw new Error("该 Provider 不支持所选清晰度");
@@ -28413,15 +28527,7 @@ function googleModelsUrl(config) {
 	const endpoint = config.googleEndpoint;
 	const fallback = "https://generativelanguage.googleapis.com/v1beta/models";
 	if (typeof endpoint !== "string" || endpoint.trim().length === 0) return fallback;
-	try {
-		const url = new URL(endpoint);
-		const segments = url.pathname.split("/").filter((segment) => segment.length > 0);
-		segments[segments.length - 1] = "models";
-		url.pathname = `/${segments.join("/")}`;
-		return url.toString();
-	} catch {
-		throw new Error("Google endpoint must be an absolute URL");
-	}
+	return googleModelsEndpoint(endpoint, config.googleNative === true);
 }
 function joinUrl(base, path) {
 	return new URL(path, base.endsWith("/") ? base : `${base}/`).toString();
@@ -28732,14 +28838,53 @@ function serveSettingsHealth(req, res, health) {
 	res.end(JSON.stringify(health));
 }
 //#endregion
+//#region lib/types/image-tool-context.js
+/** Live, credential-free instructions for the conversation model's image tools. */
+function imageToolContext(config) {
+	const provider = config.provider ?? "google";
+	let model = "not configured";
+	let editModel = model;
+	try {
+		const active = resolveProvider(config);
+		model = active.provider === "comfyui" ? active.workflow?.name ?? "workflow selected in settings" : active.model;
+		const edit = resolveProvider(withProviderOverrides(config, void 0, void 0, "edit"));
+		editModel = edit.provider === "comfyui" ? edit.workflow?.name ?? model : edit.model;
+	} catch {}
+	return [
+		`Image tools current default provider: ${provider}; generation model: ${JSON.stringify(model)}; editing model: ${JSON.stringify(editModel)}.`,
+		"Unless the user explicitly requests a different image provider or model, OMIT provider and model from generate_image, generate_images and edit_image. Do not guess a channel or switch channels after an error.",
+		"Omit unused optional arguments entirely; never fill them with empty strings. size and aspect_ratio are alternatives: provide at most one.",
+		"Subscription parameters: chatgpt-sub accepts size OR aspect_ratio, but NOT image_size. grok-sub image_size: 1K or 2K. google-sub image_size: 1K or 4K. Do not copy parameters from another provider.",
+		"Minimal calls: generate_image({\"prompt\":\"a sailboat\"}); edit_image({\"prompt\":\"make the sail blue\"}). A valid ChatGPT subscription ratio example is {\"prompt\":\"a sailboat\",\"aspect_ratio\":\"1:1\"} with image_size and size omitted."
+	].join("\n");
+}
+//#endregion
 //#region lib/types/index.js
 const name = "dsh-image-gen";
 const inject = [
 	"tools",
 	"attachments",
-	"credentials",
-	"webServer"
+	"credentials"
 ];
+/** Optional strings from tool callers may contain empty placeholders (#86). */
+function cleanImageToolArgs(args) {
+	const clean = { ...args };
+	const fields = clean;
+	for (const key of [
+		"model",
+		"size",
+		"aspect_ratio",
+		"image_size",
+		"quality",
+		"workflow"
+	]) {
+		const value = fields[key];
+		if (typeof value !== "string") continue;
+		if (value.trim().length === 0) delete fields[key];
+		else fields[key] = value.trim();
+	}
+	return clean;
+}
 /** Validate the untrusted per-call provider override from tool arguments. */
 function providerOverrideOf(value) {
 	if (value === void 0 || value === null || value === "") return void 0;
@@ -28756,142 +28901,152 @@ function apply(ctx, config = {}) {
 	const knownWorkspaceRoots = /* @__PURE__ */ new Set();
 	const canvasMirror = new CanvasMirror();
 	const subscriptionManager = new SubscriptionManager(ctx);
-	registerSubscriptionRoutes(ctx, subscriptionManager);
 	const settingsHealth = installImageSettings(ctx, current(), {
 		setSource: (source) => {
 			current = () => migrateOpenAICompatConfig(plainConfig(source()));
 		},
 		onChange: () => {}
 	});
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: SETTINGS_HEALTH_ROUTE,
-		handler: (req, res) => serveSettingsHealth(req, res, settingsHealth())
-	}), "dsh-image-gen: settings health");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: IMAGE_ROUTE,
-		handler: (req, res) => serveImage(req, res, { readImage: (ref) => ctx.attachments.readImage(ref) })
-	}), "dsh-image-gen: image route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: IMPORT_ROUTE,
-		handler: (req, res) => serveImport(req, res, {
-			saveImage: (image) => ctx.attachments.saveImage(image),
-			maxImageBytes: ctx.attachments.imageLimits.maxImageBytes,
-			mediaTypes: ctx.attachments.imageLimits.mediaTypes
-		})
-	}), "dsh-image-gen: import route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: DELETE_ROUTE,
-		handler: (req, res) => serveDelete(req, res, { deleteWorkspaceImage: async (filePath) => {
-			const discovered = await getDshWorkspaceRoots().catch(() => []);
-			return deleteImageFromWorkspace(filePath, /* @__PURE__ */ new Set([
-				...knownWorkspaceRoots,
-				...discovered,
-				process.cwd()
-			]));
-		} })
-	}), "dsh-image-gen: delete route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: SAVE_WORKSPACE_ROUTE,
-		handler: (req, res) => serveSaveWorkspace(req, res, {
-			readImage: (ref) => ctx.attachments.readImage(ref),
-			saveToWorkspace: (options) => {
-				if (options.workspaceRoot) knownWorkspaceRoots.add(options.workspaceRoot);
-				return saveImageToWorkspace({
-					workspaceRoot: options.workspaceRoot,
-					folder: current().workspaceFolder,
-					attachmentId: options.attachmentId,
-					mediaType: options.mediaType,
-					data: options.data
-				});
-			},
-			getActiveWorkspaceRoot: () => Array.from(knownWorkspaceRoots)[0] || process.cwd(),
-			getAllowedWorkspaceRoots: async () => {
+	ctx.inject(["webServer"], (webCtx) => {
+		registerSubscriptionRoutes(webCtx, subscriptionManager);
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: SETTINGS_HEALTH_ROUTE,
+			handler: (req, res) => serveSettingsHealth(req, res, settingsHealth())
+		}), "dsh-image-gen: settings health");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: IMAGE_ROUTE,
+			handler: (req, res) => serveImage(req, res, { readImage: (ref) => ctx.attachments.readImage(ref) })
+		}), "dsh-image-gen: image route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: IMPORT_ROUTE,
+			handler: (req, res) => serveImport(req, res, {
+				saveImage: (image) => ctx.attachments.saveImage(image),
+				maxImageBytes: ctx.attachments.imageLimits.maxImageBytes,
+				mediaTypes: ctx.attachments.imageLimits.mediaTypes
+			})
+		}), "dsh-image-gen: import route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: DELETE_ROUTE,
+			handler: (req, res) => serveDelete(req, res, { deleteWorkspaceImage: async (filePath) => {
 				const discovered = await getDshWorkspaceRoots().catch(() => []);
-				return /* @__PURE__ */ new Set([
+				return deleteImageFromWorkspace(filePath, /* @__PURE__ */ new Set([
 					...knownWorkspaceRoots,
 					...discovered,
 					process.cwd()
-				]);
-			},
-			isSaveEnabled: () => current().saveToWorkspace !== false
-		})
-	}), "dsh-image-gen: save workspace route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: TEST_CONNECTION_ROUTE,
-		handler: (req, res) => serveTestConnection(req, res, {
-			resolveKey: (provider) => resolveApiKey(ctx, provider),
-			config: () => current(),
-			subscriptionManager
-		})
-	}), "dsh-image-gen: test connection route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: CANVAS_STATE_ROUTE,
-		handler: (req, res) => serveCanvasState(req, res, {
-			mirror: canvasMirror,
-			maxBodyBytes: Math.ceil(ctx.attachments.imageLimits.maxImageBytes * 1.4) + 262144,
-			maxImageBytes: ctx.attachments.imageLimits.maxImageBytes
-		})
-	}), "dsh-image-gen: canvas state route");
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: CANVAS_ASSET_ROUTE,
-		handler: (req, res) => serveCanvasAsset(req, res, {
-			maxImageBytes: ctx.attachments.imageLimits.maxImageBytes,
-			saveImage: (image) => ctx.attachments.saveImage(image)
-		})
-	}), "dsh-image-gen: canvas asset route");
+				]));
+			} })
+		}), "dsh-image-gen: delete route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: SAVE_WORKSPACE_ROUTE,
+			handler: (req, res) => serveSaveWorkspace(req, res, {
+				readImage: (ref) => ctx.attachments.readImage(ref),
+				saveToWorkspace: (options) => {
+					if (options.workspaceRoot) knownWorkspaceRoots.add(options.workspaceRoot);
+					return saveImageToWorkspace({
+						workspaceRoot: options.workspaceRoot,
+						folder: current().workspaceFolder,
+						attachmentId: options.attachmentId,
+						mediaType: options.mediaType,
+						data: options.data
+					});
+				},
+				getActiveWorkspaceRoot: () => Array.from(knownWorkspaceRoots)[0] || process.cwd(),
+				getAllowedWorkspaceRoots: async () => {
+					const discovered = await getDshWorkspaceRoots().catch(() => []);
+					return /* @__PURE__ */ new Set([
+						...knownWorkspaceRoots,
+						...discovered,
+						process.cwd()
+					]);
+				},
+				isSaveEnabled: () => current().saveToWorkspace !== false
+			})
+		}), "dsh-image-gen: save workspace route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: TEST_CONNECTION_ROUTE,
+			handler: (req, res) => serveTestConnection(req, res, {
+				resolveKey: (provider) => resolveApiKey(ctx, provider),
+				config: () => current(),
+				subscriptionManager
+			})
+		}), "dsh-image-gen: test connection route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: CANVAS_STATE_ROUTE,
+			handler: (req, res) => serveCanvasState(req, res, {
+				mirror: canvasMirror,
+				maxBodyBytes: Math.ceil(ctx.attachments.imageLimits.maxImageBytes * 1.4) + 262144,
+				maxImageBytes: ctx.attachments.imageLimits.maxImageBytes
+			})
+		}), "dsh-image-gen: canvas state route");
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: CANVAS_ASSET_ROUTE,
+			handler: (req, res) => serveCanvasAsset(req, res, {
+				maxImageBytes: ctx.attachments.imageLimits.maxImageBytes,
+				saveImage: (image) => ctx.attachments.saveImage(image)
+			})
+		}), "dsh-image-gen: canvas asset route");
+	});
 	ctx.inject(["systemPrompt"], (promptCtx) => {
-		promptCtx.systemPrompt.context({
+		promptCtx.effect(() => promptCtx.systemPrompt.context({
+			name: "dsh-image-gen:image-defaults",
+			order: 59,
+			text: () => imageToolContext(current())
+		}), "dsh-image-gen: image tool context");
+		promptCtx.effect(() => promptCtx.systemPrompt.context({
 			name: "dsh-image-gen:canvas",
 			order: 60,
 			text: () => canvasMirror.digest()
-		});
+		}), "dsh-image-gen: canvas context");
 	});
 	registerCanvasTools(ctx, canvasMirror, { persistSelectionImage: (image) => ctx.attachments.saveImage({
 		data: image.data,
 		mediaType: image.mediaType,
 		name: "canvas-selection"
 	}) });
-	ctx.effect(() => ctx.webServer.register({
-		kind: "exact",
-		path: STUDIO_ROUTE,
-		handler: (req, res) => serveStudio(req, res, {
-			describe: async () => {
-				const base = await describeStudio(ctx, current(), subscriptionManager);
-				const workspaces = await getDshWorkspacesFull().catch(() => []);
-				const activeRoot = Array.from(knownWorkspaceRoots)[0] || workspaces[0]?.path || process.cwd();
-				return {
-					...base,
-					workspaceRoot: activeRoot,
-					workspaces
-				};
-			},
-			generate: (input, signal) => {
-				const fallbackRoot = Array.from(knownWorkspaceRoots)[0] || process.cwd();
-				return generateFromStudio(ctx, current(), input, signal, fallbackRoot, subscriptionManager);
-			},
-			maxBodyBytes: Math.ceil(ctx.attachments.imageLimits.maxImageBytes * 1.4 * 5) + 262144
-		})
-	}), "dsh-image-gen: studio route");
-	const serveInspiration = createInspirationRoute();
-	ctx.effect(() => ctx.webServer.register({
-		kind: "prefix",
-		path: INSPIRATION_ROUTE,
-		handler: (req, res) => {
-			const originalUrl = req.url ?? "/";
-			req.url = originalUrl.startsWith("/plugins/dsh-image-gen/inspiration") ? originalUrl.slice(34) || "/" : originalUrl;
-			return serveInspiration(req, res);
-		}
-	}), "dsh-image-gen: inspiration route");
+	ctx.inject(["webServer"], (webCtx) => {
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "exact",
+			path: STUDIO_ROUTE,
+			handler: (req, res) => serveStudio(req, res, {
+				describe: async () => {
+					const base = await describeStudio(ctx, current(), subscriptionManager);
+					const workspaces = await getDshWorkspacesFull().catch(() => []);
+					const activeRoot = Array.from(knownWorkspaceRoots)[0] || workspaces[0]?.path || process.cwd();
+					return {
+						...base,
+						workspaceRoot: activeRoot,
+						workspaces
+					};
+				},
+				generate: (input, signal) => {
+					const fallbackRoot = Array.from(knownWorkspaceRoots)[0] || process.cwd();
+					return generateFromStudio(ctx, current(), input, signal, fallbackRoot, subscriptionManager);
+				},
+				maxBodyBytes: Math.ceil(ctx.attachments.imageLimits.maxImageBytes * 1.4 * 5) + 262144
+			})
+		}), "dsh-image-gen: studio route");
+		const serveInspiration = createInspirationRoute();
+		webCtx.effect(() => webCtx.webServer.register({
+			kind: "prefix",
+			path: INSPIRATION_ROUTE,
+			handler: (req, res) => {
+				const originalUrl = req.url ?? "/";
+				req.url = originalUrl.startsWith("/plugins/dsh-image-gen/inspiration") ? originalUrl.slice(34) || "/" : originalUrl;
+				return serveInspiration(req, res);
+			}
+		}), "dsh-image-gen: inspiration route");
+	});
 	/** Per-item generation request shared by generate_image and generate_images. */
-	const generateSingle = async (args, exec) => {
+	const generateSingle = async (rawArgs, exec) => {
+		const args = cleanImageToolArgs(rawArgs);
 		const active = resolveProvider(withProviderOverrides(current(), providerOverrideOf(args.provider), args.model));
 		if (active.provider === "comfyui") {
 			const workflow = selectComfyUIWorkflow(active, args.workflow);
@@ -28926,6 +29081,7 @@ function apply(ctx, config = {}) {
 			return saveGenerated(ctx, await generateGoogleImage({
 				apiKey: credential,
 				endpoint: active.endpoint,
+				native: active.native,
 				model: active.model,
 				prompt: args.prompt,
 				aspectRatio,
@@ -29006,7 +29162,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 generate through the logged-in subscription account instead of an API key."
+				description: "OMIT unless the user explicitly requests a specific image provider. Omission uses the saved default; never guess a channel or fill this with an empty string. chatgpt-sub, grok-sub, and google-sub use logged-in subscription accounts instead of API keys."
 			},
 			model: {
 				type: "string",
@@ -29035,11 +29191,11 @@ function apply(ctx, config = {}) {
 					"2K",
 					"4K"
 				],
-				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K)."
+				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K). NEVER send this for chatgpt-sub; omit unused fields entirely."
 			},
 			size: {
 				type: "string",
-				description: "Optional dimensions or size tier for OpenAI, Seedream, or DashScope; WIDTHxHEIGHT maps to aspect_ratio for xAI Grok."
+				description: "Optional dimensions or size tier for OpenAI, Seedream, or DashScope; WIDTHxHEIGHT maps to aspect_ratio for xAI Grok. Do not combine with aspect_ratio; omit instead of using an empty string."
 			},
 			quality: {
 				type: "string",
@@ -29081,7 +29237,7 @@ function apply(ctx, config = {}) {
 					"grok-sub",
 					"google-sub"
 				],
-				description: "Optional provider for this call only, applied to every item; omit to use the configured default."
+				description: "OMIT unless the user explicitly requests a specific image provider. Uses the saved default for all items; never guess a channel or fill unused fields with empty strings."
 			},
 			model: {
 				type: "string",
@@ -29110,7 +29266,7 @@ function apply(ctx, config = {}) {
 					"2K",
 					"4K"
 				],
-				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K)."
+				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K). NEVER send this for chatgpt-sub; omit unused fields entirely."
 			},
 			size: {
 				type: "string",
@@ -29303,7 +29459,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 edit images through the logged-in subscription account instead of an API key."
+				description: "OMIT unless the user explicitly requests a specific image provider. Omission uses the saved default; never guess a channel or fill this with an empty string. Subscription providers edit through their logged-in accounts."
 			},
 			model: {
 				type: "string",
@@ -29355,7 +29511,7 @@ function apply(ctx, config = {}) {
 					"2K",
 					"4K"
 				],
-				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K)."
+				description: "Optional output resolution for Google Gemini, xAI Grok, Grok subscription (1K/2K), or Google subscription (1K/4K). NEVER send this for chatgpt-sub; omit unused fields entirely."
 			},
 			size: {
 				type: "string",
@@ -29371,8 +29527,9 @@ function apply(ctx, config = {}) {
 			}
 		},
 		output: imageOutput("Edited"),
-		async execute(args, exec) {
-			const active = resolveProvider(withProviderOverrides(current(), providerOverrideOf(args.provider), args.model));
+		async execute(rawArgs, exec) {
+			const args = cleanImageToolArgs(rawArgs);
+			const active = resolveProvider(withProviderOverrides(current(), providerOverrideOf(args.provider), args.model, "edit"));
 			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({
@@ -29433,6 +29590,7 @@ function apply(ctx, config = {}) {
 				return saveGenerated(ctx, await editGoogleImage({
 					apiKey: credential,
 					endpoint: active.endpoint,
+					native: active.native,
 					model: active.model,
 					prompt: args.prompt,
 					sourceImages,