dsh-image-gen 0.1.4 → 0.1.6

package/lib/index.js

@@ -12,16 +12,19 @@ const IMAGE_GENERATION_NAMESPACE = "image-generation";
 const IMAGE_PROVIDERS = [
 	"google",
 	"openai",
-	"seedream"
+	"seedream",
+	"dashscope"
 ];
 /** Default endpoints and base URLs. */
 const DEFAULT_GOOGLE_ENDPOINT = "https://generativelanguage.googleapis.com/v1beta/interactions";
 const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
 const DEFAULT_SEEDREAM_BASE_URL = "https://ark.cn-beijing.volces.com/api/v3";
+const DEFAULT_DASHSCOPE_ENDPOINT = "https://dashscope.aliyuncs.com/api/v1";
 /** Default model names. */
 const DEFAULT_GOOGLE_MODEL = "gemini-3.1-flash-image";
 const DEFAULT_OPENAI_MODEL = "gpt-image-2";
 const DEFAULT_SEEDREAM_MODEL = "doubao-seedream-5-0-260128";
+const DEFAULT_DASHSCOPE_MODEL = "wanx2.1-t2i-turbo";
 //#endregion
 //#region lib/types/config.js
 /** User-facing configuration for supported image providers. */
@@ -31,6 +34,8 @@ const GOOGLE_API_KEY_ENV = "GEMINI_API_KEY";
 const OPENAI_API_KEY_ENV = "OPENAI_API_KEY";
 /** Volcengine Ark credential reference. */
 const SEEDREAM_API_KEY_ENV = "ARK_API_KEY";
+/** DashScope credential reference. */
+const DASHSCOPE_API_KEY_ENV = "DASHSCOPE_API_KEY";
 /** Cordis configuration schema. */
 const Config = z.object({
 	provider: z.union(IMAGE_PROVIDERS).default("google"),
@@ -39,7 +44,9 @@ const Config = z.object({
 	openaiBaseURL: z.string().default(DEFAULT_OPENAI_BASE_URL),
 	openaiModel: z.string().default(DEFAULT_OPENAI_MODEL),
 	seedreamBaseURL: z.string().default(DEFAULT_SEEDREAM_BASE_URL),
-	seedreamModel: z.string().default(DEFAULT_SEEDREAM_MODEL)
+	seedreamModel: z.string().default(DEFAULT_SEEDREAM_MODEL),
+	dashscopeEndpoint: z.string().default(DEFAULT_DASHSCOPE_ENDPOINT),
+	dashscopeModel: z.string().default(DEFAULT_DASHSCOPE_MODEL)
 });
 /** Resolve exactly one provider profile for a tool call. */
 function resolveProvider(config) {
@@ -58,6 +65,13 @@ function resolveProvider(config) {
 			baseURL: config.seedreamBaseURL ?? "https://ark.cn-beijing.volces.com/api/v3",
 			imageSize: "2K"
 		};
+		case "dashscope": return {
+			provider: "dashscope",
+			apiKeyEnv: DASHSCOPE_API_KEY_ENV,
+			model: config.dashscopeModel ?? "wanx2.1-t2i-turbo",
+			endpoint: config.dashscopeEndpoint ?? "https://dashscope.aliyuncs.com/api/v1",
+			imageSize: "1024*1024"
+		};
 		case "google": return {
 			provider: "google",
 			apiKeyEnv: GOOGLE_API_KEY_ENV,
@@ -69,6 +83,102 @@ function resolveProvider(config) {
 	}
 }
 //#endregion
+//#region lib/types/dashscope.js
+/** Call DashScope image synthesis/generation API and handle both synchronous output & async task polling. */
+async function generateDashScopeImage(options) {
+	const base = options.endpoint.replace(/\/+$/, "");
+	const formattedSize = (options.size ?? "1024*1024").replace("x", "*");
+	const isQwenImage = options.model.toLowerCase().startsWith("qwen-image");
+	const submitUrl = isQwenImage ? `${base}/services/aigc/multimodal-generation/generation` : `${base}/services/aigc/text2image/image-synthesis`;
+	const requestBody = isQwenImage ? {
+		model: options.model,
+		input: { messages: [{
+			role: "user",
+			content: [{ text: options.prompt }]
+		}] },
+		parameters: { size: formattedSize }
+	} : {
+		model: options.model,
+		input: { prompt: options.prompt },
+		parameters: {
+			size: formattedSize,
+			n: 1
+		}
+	};
+	const submitResponse = await fetch(submitUrl, {
+		method: "POST",
+		...options.signal ? { signal: options.signal } : {},
+		headers: {
+			"content-type": "application/json",
+			authorization: `Bearer ${options.apiKey}`,
+			"X-DashScope-Async": "enable"
+		},
+		body: JSON.stringify(requestBody)
+	});
+	if (!submitResponse.ok) {
+		const errorText = await submitResponse.text();
+		throw new Error(`DashScope image generation failed (${String(submitResponse.status)}): ${errorText}`);
+	}
+	const submitResult = await submitResponse.json();
+	const directImageUrl = extractImageUrl(submitResult);
+	if (directImageUrl !== void 0) return downloadImageBlob(directImageUrl, options);
+	const taskId = submitResult.output?.task_id;
+	if (taskId === void 0 || taskId.length === 0) throw new Error(`DashScope did not return an image URL or task_id: ${submitResult.message ?? JSON.stringify(submitResult)}`);
+	const taskQueryUrl = `${base}/tasks/${taskId}`;
+	const startTime = Date.now();
+	const timeoutMs = 6e4;
+	while (Date.now() - startTime < timeoutMs) {
+		if (options.signal?.aborted) throw new Error("DashScope image task polling aborted");
+		await new Promise((resolve, reject) => {
+			const timer = setTimeout(resolve, 1500);
+			if (options.signal !== void 0) options.signal.addEventListener("abort", () => {
+				clearTimeout(timer);
+				reject(/* @__PURE__ */ new Error("DashScope image generation aborted"));
+			}, { once: true });
+		});
+		const taskResponse = await fetch(taskQueryUrl, {
+			method: "GET",
+			...options.signal ? { signal: options.signal } : {},
+			headers: { authorization: `Bearer ${options.apiKey}` }
+		});
+		if (!taskResponse.ok) {
+			const errorText = await taskResponse.text();
+			throw new Error(`DashScope task query failed (${String(taskResponse.status)}): ${errorText}`);
+		}
+		const taskResult = await taskResponse.json();
+		const status = taskResult.output?.task_status;
+		if (status === "SUCCEEDED") {
+			const imageUrl = extractImageUrl(taskResult);
+			if (imageUrl === void 0 || imageUrl.length === 0) throw new Error("DashScope task succeeded but returned no image URL");
+			return downloadImageBlob(imageUrl, options);
+		}
+		if (status === "FAILED") throw new Error(`DashScope image generation failed: ${taskResult.output?.message ?? taskResult.message ?? "Unknown error"}`);
+	}
+	throw new Error(`DashScope image generation timed out after ${String(timeoutMs / 1e3)} seconds`);
+}
+function extractImageUrl(response) {
+	const resultUrl = response.output?.results?.[0]?.url;
+	if (resultUrl !== void 0 && resultUrl.length > 0) return resultUrl;
+	const contents = response.output?.choices?.[0]?.message?.content;
+	if (Array.isArray(contents)) for (const item of contents) {
+		if (item.image !== void 0 && item.image.length > 0) return item.image;
+		if (item.image_url !== void 0 && item.image_url.length > 0) return item.image_url;
+		if (item.url !== void 0 && item.url.length > 0) return item.url;
+	}
+}
+async function downloadImageBlob(imageUrl, options) {
+	const imageResponse = await fetch(imageUrl, { ...options.signal ? { signal: options.signal } : {} });
+	if (!imageResponse.ok) throw new Error(`Failed to fetch DashScope image from URL (${String(imageResponse.status)})`);
+	const buffer = await imageResponse.arrayBuffer();
+	if (buffer.byteLength > options.maxBytes) throw new Error(`DashScope generated image (${String(buffer.byteLength)} bytes) exceeds the ${String(options.maxBytes)} byte limit`);
+	const contentType = imageResponse.headers.get("content-type");
+	const mediaType = contentType?.includes("png") ? "image/png" : contentType?.includes("webp") ? "image/webp" : "image/jpeg";
+	return {
+		data: new Uint8Array(buffer),
+		mediaType
+	};
+}
+//#endregion
 //#region lib/types/google.js
 const ERROR_LIMIT$1 = 4096;
 const REQUESTED_MEDIA_TYPE = "image/jpeg";
@@ -405,7 +515,7 @@ function apply(ctx, config = {}) {
 			},
 			size: {
 				type: "string",
-				description: "Optional dimensions or size tier for OpenAI or Seedream."
+				description: "Optional dimensions or size tier for OpenAI, Seedream, or DashScope."
 			}
 		},
 		output: {
@@ -486,6 +596,18 @@ function apply(ctx, config = {}) {
 					signal: exec.signal
 				}), active.provider, active.model, `${aspectRatio}, ${imageSize}`);
 			}
+			if (active.provider === "dashscope") {
+				const size = args.size ?? active.imageSize;
+				return saveGenerated(ctx, await generateDashScopeImage({
+					apiKey: credential.value,
+					endpoint: active.endpoint,
+					model: active.model,
+					prompt: args.prompt,
+					size,
+					maxBytes: ctx.attachments.imageLimits.maxImageBytes,
+					signal: exec.signal
+				}), active.provider, active.model, size);
+			}
 			const size = args.size ?? active.imageSize;
 			return saveGenerated(ctx, await generateOpenAICompatibleImage({
 				provider: active.provider,

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

@@ -1,6 +1,7 @@
 /**
  * Lightweight IndexedDB persistence layer for Image Generation Gallery.
  * Stores lightweight metadata indexes; image binaries remain managed by DSH Attachment service.
+ * Supports tombstones to ensure deleted items are never resurrected when revisiting conversations.
  */
 import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment';
 import type { ImageProvider } from '../shared.js';
@@ -22,6 +23,7 @@ type GalleryListener = () => void;
 export declare function subscribeGallery(listener: GalleryListener): () => void;
 /**
  * Save or update a gallery record by attachmentId.
+ * Skipped if the item was previously deleted (tombstoned).
  */
 export declare function saveGalleryItem(item: Omit<GalleryItem, 'createdAt'> & {
     createdAt?: number;
@@ -31,11 +33,11 @@ export declare function saveGalleryItem(item: Omit<GalleryItem, 'createdAt'> & {
  */
 export declare function getGalleryItems(): Promise<GalleryItem[]>;
 /**
- * Delete a single gallery record by ID.
+ * Delete a single gallery record by ID and record a tombstone.
  */
 export declare function deleteGalleryItem(id: string): Promise<void>;
 /**
- * Clear all gallery records.
+ * Clear all gallery records and reset tombstones.
  */
 export declare function clearGallery(): Promise<void>;
 export {};

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

@@ -17,6 +17,7 @@ declare const DICT: {
         readonly filterGoogle: "Google Gemini";
         readonly filterOpenAI: "OpenAI / 中转站";
         readonly filterSeedream: "字节 Seedream";
+        readonly filterDashScope: "阿里 DashScope";
         readonly emptyTitle: "暂无生图记录";
         readonly emptyDesc: "在对话中让 Agent 生图后，生成的图片会自动收录到这里。";
         readonly noMatchTitle: "未找到匹配结果";
@@ -28,6 +29,9 @@ declare const DICT: {
         readonly download: "下载图片";
         readonly copyImg: "复制图片";
         readonly copyPpt: "复制 Prompt";
+        readonly delete: "从画廊删除";
+        readonly confirmDelete: "确定要从画廊中删除这张图片吗？（不会影响原聊天记录）";
+        readonly deleted: "已从画廊删除";
         readonly model: "模型";
         readonly prompt: "Prompt";
         readonly close: "关闭 (Esc)";
@@ -39,6 +43,7 @@ declare const DICT: {
         readonly filterGoogle: "Google Gemini";
         readonly filterOpenAI: "OpenAI / Relay";
         readonly filterSeedream: "ByteDance Seedream";
+        readonly filterDashScope: "Aliyun DashScope";
         readonly emptyTitle: "No images generated yet";
         readonly emptyDesc: "Images generated during conversations will automatically appear here.";
         readonly noMatchTitle: "No matching images";
@@ -50,6 +55,9 @@ declare const DICT: {
         readonly download: "Download";
         readonly copyImg: "Copy Image";
         readonly copyPpt: "Copy Prompt";
+        readonly delete: "Delete from gallery";
+        readonly confirmDelete: "Are you sure you want to remove this image from the gallery? (Chat history will not be affected)";
+        readonly deleted: "Deleted from gallery";
         readonly model: "Model";
         readonly prompt: "Prompt";
         readonly close: "Close (Esc)";

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

@@ -13,6 +13,8 @@ interface ImageSettings {
     openaiModel?: string;
     seedreamBaseURL?: string;
     seedreamModel?: string;
+    dashscopeEndpoint?: string;
+    dashscopeModel?: string;
 }
 interface SettingsFace {
     scope: SettingsScope<ImageSettings>;

package/lib/types/config.d.ts

@@ -1,13 +1,15 @@
 /** User-facing configuration for supported image providers. */
 import z from '@deepseek-ai/schemastery';
-import { DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, type ImageProvider } from './shared.js';
-export { DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, type ImageProvider, };
+import { DEFAULT_DASHSCOPE_ENDPOINT, DEFAULT_DASHSCOPE_MODEL, DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, type ImageProvider } from './shared.js';
+export { DEFAULT_DASHSCOPE_ENDPOINT, DEFAULT_DASHSCOPE_MODEL, DEFAULT_GOOGLE_ENDPOINT, DEFAULT_GOOGLE_MODEL, DEFAULT_OPENAI_BASE_URL, DEFAULT_OPENAI_MODEL, DEFAULT_SEEDREAM_BASE_URL, DEFAULT_SEEDREAM_MODEL, IMAGE_PROVIDERS, type ImageProvider, };
 /** Google API credential reference. */
 export declare const GOOGLE_API_KEY_ENV = "GEMINI_API_KEY";
 /** OpenAI Platform or compatible relay credential reference. */
 export declare const OPENAI_API_KEY_ENV = "OPENAI_API_KEY";
 /** Volcengine Ark credential reference. */
 export declare const SEEDREAM_API_KEY_ENV = "ARK_API_KEY";
+/** DashScope credential reference. */
+export declare const DASHSCOPE_API_KEY_ENV = "DASHSCOPE_API_KEY";
 /** Google tool-level controls. */
 export declare const ASPECT_RATIOS: readonly ["1:1", "3:2", "2:3", "4:3", "3:4", "16:9", "9:16"];
 export declare const IMAGE_SIZES: readonly ["1K", "2K", "4K"];
@@ -22,6 +24,8 @@ export interface Config {
     openaiModel?: string;
     seedreamBaseURL?: string;
     seedreamModel?: string;
+    dashscopeEndpoint?: string;
+    dashscopeModel?: string;
 }
 /** Cordis configuration schema. */
 export declare const Config: z<Config>;
@@ -45,4 +49,10 @@ export declare function resolveProvider(config: Config): {
     model: string;
     baseURL: string;
     imageSize: string;
+} | {
+    provider: 'dashscope';
+    apiKeyEnv: string;
+    model: string;
+    endpoint: string;
+    imageSize: string;
 };

package/lib/types/dashscope.d.ts

@@ -0,0 +1,16 @@
+/** DashScope (Aliyun Wanx & Qwen-Image) image-generation protocol adapter. */
+import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment';
+export interface DashScopeImageOptions {
+    apiKey: string;
+    endpoint: string;
+    model: string;
+    prompt: string;
+    size?: string;
+    maxBytes: number;
+    signal?: AbortSignal;
+}
+/** Call DashScope image synthesis/generation API and handle both synchronous output & async task polling. */
+export declare function generateDashScopeImage(options: DashScopeImageOptions): Promise<{
+    data: Uint8Array;
+    mediaType: ImageAttachmentRef['mediaType'];
+}>;

package/lib/types/shared.d.ts

@@ -4,15 +4,17 @@ export declare const IMAGE_ROUTE = "/plugins/dsh-image-gen/image";
 /** Namespace persisted through DSH Settings. */
 export declare const IMAGE_GENERATION_NAMESPACE = "image-generation";
 /** Supported providers. */
-export declare const IMAGE_PROVIDERS: readonly ["google", "openai", "seedream"];
+export declare const IMAGE_PROVIDERS: readonly ["google", "openai", "seedream", "dashscope"];
 export type ImageProvider = typeof IMAGE_PROVIDERS[number];
 /** Default endpoints and base URLs. */
 export declare const DEFAULT_GOOGLE_ENDPOINT = "https://generativelanguage.googleapis.com/v1beta/interactions";
 export declare const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
 export declare const DEFAULT_SEEDREAM_BASE_URL = "https://ark.cn-beijing.volces.com/api/v3";
+export declare const DEFAULT_DASHSCOPE_ENDPOINT = "https://dashscope.aliyuncs.com/api/v1";
 /** Default model names. */
 export declare const DEFAULT_GOOGLE_MODEL = "gemini-3.1-flash-image";
 export declare const DEFAULT_OPENAI_MODEL = "gpt-image-2";
 export declare const DEFAULT_SEEDREAM_MODEL = "doubao-seedream-5-0-260128";
+export declare const DEFAULT_DASHSCOPE_MODEL = "wanx2.1-t2i-turbo";
 export declare const DEFAULT_MODELS: Record<ImageProvider, string>;
 export declare const DEFAULT_BASE_URLS: Record<ImageProvider, string>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-image-gen",
-  "version": "0.1.4",
-  "description": "Bring ChatGPT-like image generation to DeepSeek Harness — Gemini, OpenAI, Seedream & more.",
+  "version": "0.1.6",
+  "description": "Bring ChatGPT-like image generation to DeepSeek Harness — Gemini, OpenAI, Seedream, DashScope & more.",
   "type": "module",
   "author": "shanliuling",
   "repository": {
@@ -71,6 +71,9 @@
     "openai",
     "openai-compatible",
     "seedream",
+    "dashscope",
+    "wanx",
+    "aliyun",
     "volcengine",
     "byok",
     "cordis"