dsh-image-gen 0.1.6 → 0.2.0

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

@@ -15,6 +15,8 @@ interface ImageSettings {
     seedreamModel?: string;
     dashscopeEndpoint?: string;
     dashscopeModel?: string;
+    saveToWorkspace?: boolean;
+    workspaceFolder?: string;
 }
 interface SettingsFace {
     scope: SettingsScope<ImageSettings>;

package/lib/types/config.d.ts

@@ -2,6 +2,8 @@
 import z from '@deepseek-ai/schemastery';
 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, };
+/** Default workspace subfolder that receives generated image files. */
+export declare const DEFAULT_WORKSPACE_FOLDER = "dsh-image-gen";
 /** Google API credential reference. */
 export declare const GOOGLE_API_KEY_ENV = "GEMINI_API_KEY";
 /** OpenAI Platform or compatible relay credential reference. */
@@ -26,6 +28,10 @@ export interface Config {
     seedreamModel?: string;
     dashscopeEndpoint?: string;
     dashscopeModel?: string;
+    /** Also write every generated image as a file under the session workspace. */
+    saveToWorkspace?: boolean;
+    /** Workspace subfolder for generated images; empty means the workspace root. */
+    workspaceFolder?: string;
 }
 /** Cordis configuration schema. */
 export declare const Config: z<Config>;

package/lib/types/dashscope.d.ts

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

package/lib/types/google.d.ts

@@ -6,14 +6,25 @@ export interface GeneratedImage {
     data: Uint8Array;
     mediaType: ImageMediaType;
 }
-/** Send one native Google image request and validate its inline image response. */
-export declare function generateGoogleImage(input: {
+interface GoogleRequestBase {
     apiKey: string;
     endpoint: string;
     model: string;
-    prompt: string;
     aspectRatio: AspectRatio;
     imageSize: ImageSize;
     maxBytes: number;
     signal: AbortSignal;
+}
+/** Send one native Google text-to-image request. */
+export declare function generateGoogleImage(input: GoogleRequestBase & {
+    prompt: string;
+}): Promise<GeneratedImage>;
+/** Send one native Google image-editing request using already-resolved bytes. */
+export declare function editGoogleImage(input: GoogleRequestBase & {
+    prompt: string;
+    sourceImage: {
+        data: Uint8Array;
+        mediaType: ImageMediaType;
+    };
 }): Promise<GeneratedImage>;
+export {};

package/lib/types/index.d.ts

@@ -3,9 +3,6 @@ import type { Context } from '@deepseek-ai/cordis';
 import { Config } from './config.js';
 export { Config } from './config.js';
 export { IMAGE_ROUTE, imageAttachmentFromMeta } from './image-route.js';
-/** Cordis plugin name. */
 export declare const name = "dsh-image-gen";
-/** Host services required by the Bundle. */
 export declare const inject: string[];
-/** Register settings, the image route, and the model-callable tool. */
 export declare function apply(ctx: Context, config?: Config): void;

package/lib/types/openai-compatible.d.ts

@@ -1,11 +1,13 @@
-/** OpenAI Images API and Volcengine Ark/Seedream response adapter. */
+/** OpenAI Images API and compatible response adapter. */
 import type { ImageMediaType } from '@deepseek-ai/dsh-attachment';
-/** One generated raster normalized before Attachment persistence. */
 export interface GeneratedCompatibleImage {
     data: Uint8Array;
     mediaType: ImageMediaType;
 }
-/** Generate an image from an OpenAI-compatible endpoint. */
+export interface CompatibleReferenceImage {
+    data: Uint8Array;
+    mediaType: ImageMediaType;
+}
 export declare function generateOpenAICompatibleImage(input: {
     provider: 'openai' | 'seedream';
     apiKey: string;
@@ -16,3 +18,13 @@ export declare function generateOpenAICompatibleImage(input: {
     maxBytes: number;
     signal: AbortSignal;
 }): Promise<GeneratedCompatibleImage>;
+export declare function editOpenAICompatibleImage(input: {
+    apiKey: string;
+    baseURL: string;
+    model: string;
+    prompt: string;
+    sourceImage: CompatibleReferenceImage;
+    size?: string;
+    maxBytes: number;
+    signal: AbortSignal;
+}): Promise<GeneratedCompatibleImage>;

package/lib/types/reference-image.d.ts

@@ -0,0 +1,38 @@
+import type { ImageAttachmentRef, ImageMediaType, StoredImageAttachment } from '@deepseek-ai/dsh-attachment';
+import type { Message } from '@deepseek-ai/dsh-llm';
+/** Provider-neutral image bytes passed across the DSH/provider boundary. */
+export interface ResolvedReferenceImage {
+    data: Uint8Array;
+    mediaType: ImageMediaType;
+}
+/** The small latest-DSH session surface this Bundle depends on. */
+export interface ReferenceImageAgent {
+    session: {
+        deriveMessages(): readonly Message[];
+        header?: {
+            cwd?: string;
+        };
+    };
+}
+/** The small latest-DSH attachment surface this Bundle depends on. */
+export interface ReferenceImageStore {
+    readImage(ref: ImageAttachmentRef, signal?: AbortSignal): Promise<StoredImageAttachment>;
+}
+/**
+ * Resolve and read the image to edit from the current effective conversation.
+ *
+ * This is the only module allowed to know how DSH sessions expose effective
+ * messages or how nested model-facing content stores durable image refs.
+ */
+export declare function resolveReferenceImage(input: {
+    agent?: ReferenceImageAgent;
+    attachments: ReferenceImageStore;
+    sourceAttachmentId?: string;
+    sourcePath?: string;
+    maxBytes?: number;
+    signal: AbortSignal;
+}): Promise<ResolvedReferenceImage>;
+/** Find the newest matching image in the effective, replacement-aware history. */
+export declare function findReferenceImage(messages: readonly Message[], sourceAttachmentId?: string): ImageAttachmentRef | undefined;
+/** Validate an untrusted serialized image reference at an HTTP/UI boundary. */
+export declare function parseImageAttachmentRef(value: unknown): ImageAttachmentRef | undefined;

package/lib/types/seedream.d.ts

@@ -0,0 +1,17 @@
+/** Volcengine Ark Seedream image-editing adapter. */
+import type { ImageMediaType } from '@deepseek-ai/dsh-attachment';
+import type { GeneratedCompatibleImage } from './openai-compatible.js';
+/** Edit one image through Ark ImageGenerations using a data-URL reference. */
+export declare function editSeedreamImage(input: {
+    apiKey: string;
+    baseURL: string;
+    model: string;
+    prompt: string;
+    sourceImage: {
+        data: Uint8Array;
+        mediaType: ImageMediaType;
+    };
+    size?: string;
+    maxBytes: number;
+    signal: AbortSignal;
+}): Promise<GeneratedCompatibleImage>;

package/lib/types/shared.d.ts

@@ -15,6 +15,6 @@ export declare const DEFAULT_DASHSCOPE_ENDPOINT = "https://dashscope.aliyuncs.co
 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_DASHSCOPE_MODEL = "qwen-image-3.0";
 export declare const DEFAULT_MODELS: Record<ImageProvider, string>;
 export declare const DEFAULT_BASE_URLS: Record<ImageProvider, string>;

package/lib/types/workspace-save.d.ts

@@ -0,0 +1,52 @@
+import type { ImageAttachmentRef } from '@deepseek-ai/dsh-attachment';
+/**
+ * Build the deterministic file name for a generated image:
+ * `image-<digest-prefix>.<ext>`. The digest prefix comes from the
+ * content-addressed attachment id, so the same image bytes always map to the
+ * same file name regardless of when they were generated, and re-saving simply
+ * overwrites the previous copy in place.
+ * @param attachmentId - durable attachment id (`sha256:<hex>`).
+ * @param mediaType - verified image media type.
+ * @returns the file name (no directory).
+ */
+export declare function workspaceImageName(attachmentId: string, mediaType: ImageAttachmentRef['mediaType']): string;
+/**
+ * Resolve the configured image folder inside the session workspace. The
+ * folder may nest, but must stay inside the workspace: absolute paths and
+ * parent-traversal segments are rejected for both separator styles.
+ *
+ * This lexical pass is necessary but not sufficient: `saveImageToWorkspace`
+ * additionally verifies the on-disk resolution so symlinked folders cannot
+ * escape the workspace.
+ * @param workspaceRoot - the session workspace directory.
+ * @param folder - configured subfolder; empty/blank means the workspace root.
+ * @returns the absolute image directory.
+ * @throws when the folder would escape the workspace root.
+ */
+export declare function workspaceImageDir(workspaceRoot: string, folder: string | undefined): string;
+/**
+ * Write one generated image durably under the session workspace.
+ *
+ * Containment is enforced twice: lexically by `workspaceImageDir`, then
+ * against real paths, so a configured folder (or any intermediate segment)
+ * that is a symlink pointing outside the workspace is rejected before and
+ * after anything is created.
+ *
+ * The bytes are written to a same-directory staging file and renamed onto the
+ * target, so a crash never leaves a half-written image under its final name.
+ * Re-saving identical bytes rewrites the same file (the name is content-
+ * addressed), which keeps repeated generations idempotent. A cancellation is
+ * honoured up to and including the final rename: an aborted save never
+ * resolves successfully and never leaves the image behind under its final
+ * name.
+ * @param options - workspace root, configured folder, attachment identity, and image bytes.
+ * @returns the absolute path of the written file.
+ */
+export declare function saveImageToWorkspace(options: {
+    workspaceRoot: string;
+    folder?: string | undefined;
+    attachmentId: string;
+    mediaType: ImageAttachmentRef['mediaType'];
+    data: Uint8Array;
+    signal?: AbortSignal;
+}): Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-image-gen",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "Bring ChatGPT-like image generation to DeepSeek Harness — Gemini, OpenAI, Seedream, DashScope & more.",
   "type": "module",
   "author": "shanliuling",
@@ -54,6 +54,13 @@
       "platform": "web"
     }
   },
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "build": "tsc && tsdown",
+    "prepare": "pnpm run build",
+    "test": "vitest run",
+    "pack:check": "pnpm pack --dry-run"
+  },
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
   },
@@ -80,37 +87,38 @@
   ],
   "peerDependencies": {
     "@deepseek-ai/cordis": ">=4.0.0 <5",
-    "@deepseek-ai/dsh-attachment": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-api-remotes": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-client-connection": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-client-runtime": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-client-ui-conversation": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-client-ui-tool": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-credentials": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-host-webserver": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.5 <0.2.0",
-    "@deepseek-ai/dsh-tools": ">=0.1.0-rc.5 <0.2.0",
+    "@deepseek-ai/dsh-api-remotes": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-attachment": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-connection": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-runtime": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-ui-conversation": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-client-ui-tool": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-credentials": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-host-webserver": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-settings": ">=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-tools": ">=0.1.1-rc.2 <0.2.0",
     "@deepseek-ai/schemastery": ">=3.18.0 <4",
     "react": ">=18.2.0 <19"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/dsh-attachment": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-api-remotes": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-connection": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-tool": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-credentials": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-host-webserver": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-tools": "0.1.0-rc.6",
+    "@deepseek-ai/dsh-api-remotes": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-connection": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-runtime": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-client-ui-tool": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-credentials": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-tools": "0.1.1-rc.2",
     "@deepseek-ai/schemastery": "3.18.1",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
@@ -119,10 +127,5 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.8"
   },
-  "scripts": {
-    "typecheck": "tsc --noEmit",
-    "build": "tsc && tsdown",
-    "test": "vitest run",
-    "pack:check": "pnpm pack --dry-run"
-  }
-}
+  "packageManager": "pnpm@11.7.0"
+}