dsh-plugin-subscriptions 0.4.0 → 0.4.1

package/README.md

@@ -22,6 +22,14 @@ The `image_generate` tool renders its result inline in the conversation:
 
 ![image_generate renders the image inline](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/image-generate-inline.png)
 
+Its `provider` parameter picks the image backend — the same prompt through GPT (`gpt-image-2`, top) and Grok (`grok-imagine-image-2.0`, bottom):
+
+![image_generate with provider gpt vs grok](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/image-generate-providers.png)
+
+The `video_generate` tool plays the generated clip inline:
+
+![video_generate plays the clip inline](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/video-generate-inline.png)
+
 ## Providers
 
 | Route    | Subscription      | Models |
@@ -37,7 +45,7 @@ Logged-in cards also show **subscription usage** — per rate-limit window (5-ho
 Also included, registered when the matching provider is enabled:
 
 - **`x_search`** tool (Grok) — xAI's hosted X search, returning `{ answer, citations }`.
-- **`image_generate`** tool (ChatGPT) — `gpt-image-2` via the Codex backend; PNGs are saved under `~/.dsh/plugins/subscriptions/images/` and the paths returned.
+- **`image_generate`** tool (ChatGPT or Grok) — `gpt-image-2` via the Codex backend, or `grok-imagine-image-2.0` via `api.x.ai/v1/images/generations`. The `provider` argument picks the preferred provider (`gpt`, the default, or `grok`); when the preferred one is logged out the other serves as fallback. Images are saved under `~/.dsh/plugins/subscriptions/images/` and the paths returned. The `size`/`quality` arguments map onto Grok's `aspect_ratio`/`quality` on the Grok path.
 - **`video_generate`** tool (Grok) — `grok-imagine-video-1.5` via `api.x.ai/v1/videos` (async submit + poll); MP4s are saved under `~/.dsh/plugins/subscriptions/videos/`, the path returned, and the clip plays inline in the conversation. Supports duration (1–15 s), aspect ratio, resolution, and image-to-video via `image_url`.
 
 ## Install

package/README.zh.md

@@ -22,6 +22,14 @@
 
 ![image_generate 内联显示生成的图片](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/image-generate-inline.png)
 
+`provider` 参数可选择生图后端——同一条提示词分别走 GPT(`gpt-image-2`,上)和 Grok(`grok-imagine-image-2.0`,下):
+
+![image_generate 的 provider 参数对比 gpt 与 grok](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/image-generate-providers.png)
+
+`video_generate` 工具生成的视频直接内联播放:
+
+![video_generate 内联播放生成的视频](https://raw.githubusercontent.com/V1ki/dsh-plugin-subscriptions/main/docs/images/video-generate-inline.png)
+
 ## Provider 一览
 
 | 路由     | 订阅             | 模型 |
@@ -37,7 +45,7 @@
 随 provider 启用自动注册的工具:
 
 - **`x_search`**(Grok)—— xAI 托管的 X 搜索,返回 `{ answer, citations }`。
-- **`image_generate`**(ChatGPT)—— 经 Codex 后端调用 `gpt-image-2`;生成的 PNG 保存到 `~/.dsh/plugins/subscriptions/images/` 并返回路径。
+- **`image_generate`**(ChatGPT 或 Grok)—— 经 Codex 后端调用 `gpt-image-2`,或经 `api.x.ai/v1/images/generations` 调用 `grok-imagine-image-2.0`。`provider` 参数指定首选提供方(`gpt` 为默认值,可选 `grok`);首选方未登录时自动回退到另一方。图片保存到 `~/.dsh/plugins/subscriptions/images/` 并返回路径。Grok 路径上 `size`/`quality` 参数会映射为 Grok 的 `aspect_ratio`/`quality`。
 - **`video_generate`**(Grok)—— 经 `api.x.ai/v1/videos` 调用 `grok-imagine-video-1.5`(异步提交 + 轮询);MP4 保存到 `~/.dsh/plugins/subscriptions/videos/` 并返回路径,视频直接在对话里内联播放。支持时长(1–15 秒)、宽高比、分辨率,以及通过 `image_url` 做图生视频。
 
 ## 安装

package/lib/index.js

@@ -3078,13 +3078,17 @@ function createXSearchTool(options) {
 
 //#endregion
 //#region src/tools/image-generate.ts
-/** Endpoint the generation request is posted to. */
+/** Endpoint the codex generation request is posted to. */
 const IMAGE_GENERATE_URL = "https://chatgpt.com/backend-api/codex/images/generations";
 /** The image model the codex subscription endpoint serves. */
 const IMAGE_GENERATE_MODEL = "gpt-image-2";
+/** Endpoint the grok generation request is posted to. */
+const GROK_IMAGE_GENERATE_URL = "https://api.x.ai/v1/images/generations";
+/** The image model the grok subscription endpoint serves. */
+const GROK_IMAGE_GENERATE_MODEL = "grok-imagine-image-2.0";
 /**
-* Assemble the request body from tool arguments (hand-checks the non-empty
-* prompt the schema DSL cannot express).
+* Assemble the codex request body from tool arguments (hand-checks the
+* non-empty prompt the schema DSL cannot express).
 */
 function buildImageGenerateBody(args) {
 	const prompt = args.prompt.trim();
@@ -3096,6 +3100,30 @@ function buildImageGenerateBody(args) {
 		...args.quality === void 0 ? {} : { quality: args.quality }
 	};
 }
+/** The codex `size` values mapped onto grok aspect ratios. */
+const GROK_ASPECT_RATIOS = {
+	"1024x1024": "1:1",
+	"1024x1536": "2:3",
+	"1536x1024": "3:2",
+	"auto": "auto"
+};
+/**
+* Assemble the grok request body from the same tool arguments: `size` maps
+* onto the nearest `aspect_ratio`, and `quality` folds into grok's low/medium
+* pair (`high` → `medium`, `auto` → provider default).
+*/
+function buildGrokImageGenerateBody(args) {
+	const prompt = args.prompt.trim();
+	if (prompt.length === 0) throw new Error("image_generate: prompt must be a non-empty string");
+	const quality = args.quality === "low" ? "low" : args.quality === "medium" || args.quality === "high" ? "medium" : void 0;
+	return {
+		prompt,
+		model: GROK_IMAGE_GENERATE_MODEL,
+		response_format: "b64_json",
+		...args.size === void 0 ? {} : { aspect_ratio: GROK_ASPECT_RATIOS[args.size] },
+		...quality === void 0 ? {} : { quality }
+	};
+}
 /**
 * Parse the generations response into decodable images. Throws when the
 * payload carries no usable `b64_json` entries.
@@ -3116,13 +3144,29 @@ function parseImageGenerateResponse(payload) {
 	if (images.length === 0) throw new Error("image_generate: the response carried no image data");
 	return images;
 }
-/** Directory the generated PNG files are written to. */
+/** Directory the generated image files are written to. */
 function imagesDirectory() {
 	return dshHomePath("plugins", "subscriptions", "images");
 }
+/**
+* Sniff a generated image's media type from its magic bytes (codex serves
+* PNG; grok's format is undocumented, so trust the bytes). Unrecognized data
+* defaults to PNG, matching the historical behavior.
+*/
+function sniffImageMediaType(data) {
+	if (data.length >= 3 && data[0] === 255 && data[1] === 216 && data[2] === 255) return "image/jpeg";
+	if (data.length >= 12 && data.toString("latin1", 0, 4) === "RIFF" && data.toString("latin1", 8, 12) === "WEBP") return "image/webp";
+	return "image/png";
+}
+/** File extension for one sniffed media type. */
+const MEDIA_TYPE_EXTENSIONS = {
+	"image/png": "png",
+	"image/jpeg": "jpg",
+	"image/webp": "webp"
+};
 /** Timestamped, collision-safe file name for one generated image. */
-function imageFileName(index) {
-	return `image-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${Math.random().toString(36).slice(2, 8)}-${index}.png`;
+function imageFileName(index, mediaType) {
+	return `image-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${Math.random().toString(36).slice(2, 8)}-${index}.${MEDIA_TYPE_EXTENSIONS[mediaType]}`;
 }
 /** Bound a call-card title's prompt. */
 function truncate$1(text, max = 60) {
@@ -3180,7 +3224,7 @@ function imageGenerateText(value) {
 function createImageGenerateTool(options) {
 	return defineTool({
 		name: "image_generate",
-		description: "Generate an image with the ChatGPT subscription (gpt-image-2) and save it as a PNG file. Returns the saved file paths; on image-capable models the image itself is attached.",
+		description: "Generate an image with the ChatGPT subscription (gpt-image-2) or the Grok subscription (grok-imagine-image-2.0) and save it as an image file. The `provider` parameter picks the preferred provider (default gpt); when the preferred one is logged out the other serves as fallback. Returns the saved file paths; on image-capable models the image itself is attached.",
 		parameters: {
 			prompt: {
 				type: "string",
@@ -3206,6 +3250,11 @@ function createImageGenerateTool(options) {
 					"auto"
 				],
 				description: "Rendering quality; omit for the provider default."
+			},
+			provider: {
+				type: "string",
+				enum: ["gpt", "grok"],
+				description: "Preferred provider (default gpt); the other one serves as fallback when the preferred is logged out."
 			}
 		},
 		output: {
@@ -3268,29 +3317,57 @@ function createImageGenerateTool(options) {
 			content: result.content.filter((block) => block.type === "text")
 		}),
 		async execute(args, exec) {
-			const body = buildImageGenerateBody(args);
-			const session = await options.tokens.session();
-			const response = await (options.fetchFn ?? fetch)(IMAGE_GENERATE_URL, {
-				method: "POST",
-				headers: {
-					"authorization": `Bearer ${session.accessToken}`,
-					"chatgpt-account-id": session.accountId,
-					"originator": "codex_cli_rs",
-					"content-type": "application/json",
-					"accept": "application/json"
-				},
-				body: JSON.stringify(body),
-				signal: exec.signal
-			});
+			const fetchFn = options.fetchFn ?? fetch;
+			const preferGrok = args.provider === "grok";
+			const codexReady = options.codexTokens !== void 0 && await options.codexTokens.hasSession();
+			const grokReady = options.grokTokens !== void 0 && await options.grokTokens.hasSession();
+			const useGrok = preferGrok ? grokReady : grokReady && !codexReady;
+			const useCodex = !useGrok && codexReady;
+			let response;
+			if (useCodex && options.codexTokens !== void 0) {
+				const session = await options.codexTokens.session();
+				response = await fetchFn(IMAGE_GENERATE_URL, {
+					method: "POST",
+					headers: {
+						"authorization": `Bearer ${session.accessToken}`,
+						"chatgpt-account-id": session.accountId,
+						"originator": "codex_cli_rs",
+						"content-type": "application/json",
+						"accept": "application/json"
+					},
+					body: JSON.stringify(buildImageGenerateBody(args)),
+					signal: exec.signal
+				});
+			} else if (useGrok && options.grokTokens !== void 0) {
+				const session = await options.grokTokens.session();
+				response = await fetchFn(GROK_IMAGE_GENERATE_URL, {
+					method: "POST",
+					headers: {
+						"authorization": `Bearer ${session.accessToken}`,
+						"content-type": "application/json",
+						"accept": "application/json"
+					},
+					body: JSON.stringify(buildGrokImageGenerateBody(args)),
+					signal: exec.signal
+				});
+			} else {
+				const manager = preferGrok ? options.grokTokens ?? options.codexTokens : options.codexTokens ?? options.grokTokens;
+				if (manager === void 0) throw new Error("image_generate: no image provider is configured");
+				await manager.session();
+				throw new Error("image_generate: no image provider is logged in");
+			}
 			if (!response.ok) throw await httpLlmError(response, "image_generate");
 			const images = parseImageGenerateResponse(await response.json());
 			const directory = options.imagesDir ?? imagesDirectory();
 			await mkdir(directory, { recursive: true });
 			const paths = [];
+			const mediaTypes = [];
 			for (const [index, image] of images.entries()) {
-				const path = join(directory, imageFileName(index));
+				const mediaType = sniffImageMediaType(image.data);
+				const path = join(directory, imageFileName(index, mediaType));
 				await writeFile(path, image.data);
 				paths.push(path);
+				mediaTypes.push(mediaType);
 			}
 			const attachments = options.resolveAttachments?.();
 			const imageCapable = attachments !== void 0 && await routeDeclaresImageInput(options.resolveLlm, exec);
@@ -3298,7 +3375,7 @@ function createImageGenerateTool(options) {
 			if (attachments !== void 0 && imageCapable) for (const [index, image] of images.entries()) {
 				const ref = await attachments.saveImage({
 					data: image.data,
-					mediaType: "image/png",
+					mediaType: mediaTypes[index],
 					name: basename(paths[index])
 				});
 				refs.push({
@@ -3867,8 +3944,9 @@ function apply(ctx, config) {
 			toolsCtx.tools.register(createXSearchTool({ tokens: grokTokens }));
 			toolsCtx.tools.register(createVideoGenerateTool({ tokens: grokTokens }));
 		}
-		if (codexTokens !== void 0) toolsCtx.tools.register(createImageGenerateTool({
-			tokens: codexTokens,
+		if (codexTokens !== void 0 || grokTokens !== void 0) toolsCtx.tools.register(createImageGenerateTool({
+			...codexTokens === void 0 ? {} : { codexTokens },
+			...grokTokens === void 0 ? {} : { grokTokens },
 			resolveAttachments,
 			resolveLlm: () => ctx.get("llm")
 		}));

package/lib/tools/image-generate.d.ts

@@ -1,27 +1,37 @@
 /**
- * `image_generate` tool: generate images through the ChatGPT/Codex
- * subscription's image endpoint, save them as PNG files under the harness
- * home, and — when the deployment mounts an attachment store and the calling
- * route declares image input — also commit the bytes as durable attachments
- * so the images render inline and enter model context (the same path
- * `read_image` uses). Mirrors codex-rs `codex-api/src/images.rs`: POST
- * `/backend-api/codex/images/generations` with the responses call's auth
- * headers; the response carries base64 PNG data.
+ * `image_generate` tool: generate images through a subscription image
+ * endpoint, save them under the harness home, and — when the deployment
+ * mounts an attachment store and the calling route declares image input —
+ * also commit the bytes as durable attachments so the images render inline
+ * and enter model context (the same path `read_image` uses).
+ *
+ * Provider selection: the `provider` argument names the preferred provider
+ * (default `gpt`, i.e. the ChatGPT/Codex subscription serving gpt-image-2 —
+ * mirrors codex-rs `codex-api/src/images.rs`); when the preferred one is
+ * logged out the other serves as fallback (`grok` is grok-imagine-image-2.0
+ * via `api.x.ai/v1/images/generations` with `response_format: 'b64_json'`).
+ * Both answer the OpenAI images shape (`data[].b64_json`).
  */
 import type { AttachmentStore } from '@deepseek-ai/dsh-attachment';
 import type { LlmRuntime } from '@deepseek-ai/dsh-llm';
 import type { ToolDefinition } from '@deepseek-ai/dsh-tools';
-import type { CodexSession } from '../auth/store.js';
+import type { CodexSession, GrokSession } from '../auth/store.js';
 import { TokenManager } from '../providers/common.js';
 import type { FetchFn } from '../providers/common.js';
-/** Endpoint the generation request is posted to. */
+/** Endpoint the codex generation request is posted to. */
 export declare const IMAGE_GENERATE_URL = "https://chatgpt.com/backend-api/codex/images/generations";
 /** The image model the codex subscription endpoint serves. */
 export declare const IMAGE_GENERATE_MODEL = "gpt-image-2";
+/** Endpoint the grok generation request is posted to. */
+export declare const GROK_IMAGE_GENERATE_URL = "https://api.x.ai/v1/images/generations";
+/** The image model the grok subscription endpoint serves. */
+export declare const GROK_IMAGE_GENERATE_MODEL = "grok-imagine-image-2.0";
 /** Dependencies of the `image_generate` tool. */
 export interface ImageGenerateToolOptions {
-    /** Codex session source; a missing session throws the log-in hint. */
-    tokens: TokenManager<CodexSession>;
+    /** Codex session source; the default preferred provider (`provider: 'gpt'`). */
+    codexTokens?: TokenManager<CodexSession>;
+    /** Grok session source; preferred when the call passes `provider: 'grok'`. */
+    grokTokens?: TokenManager<GrokSession>;
     /** Fetch implementation (injectable for tests). */
     fetchFn?: FetchFn;
     /** Directory override for saved images (defaults under the harness home). */
@@ -38,15 +48,33 @@ export interface ImageGenerateRequestBody {
     size?: string;
     quality?: string;
 }
-/**
- * Assemble the request body from tool arguments (hand-checks the non-empty
- * prompt the schema DSL cannot express).
- */
-export declare function buildImageGenerateBody(args: {
+/** The tool's own argument shape, shared by both provider body builders. */
+export interface ImageGenerateArgs {
     prompt: string;
     size?: '1024x1024' | '1024x1536' | '1536x1024' | 'auto';
     quality?: 'low' | 'medium' | 'high' | 'auto';
-}): ImageGenerateRequestBody;
+    /** Preferred provider; the other one serves when the preferred is logged out. */
+    provider?: 'gpt' | 'grok';
+}
+/**
+ * Assemble the codex request body from tool arguments (hand-checks the
+ * non-empty prompt the schema DSL cannot express).
+ */
+export declare function buildImageGenerateBody(args: ImageGenerateArgs): ImageGenerateRequestBody;
+/** The wire request body for one grok generation call. */
+export interface GrokImageGenerateRequestBody {
+    prompt: string;
+    model: string;
+    response_format: 'b64_json';
+    aspect_ratio?: string;
+    quality?: 'low' | 'medium';
+}
+/**
+ * Assemble the grok request body from the same tool arguments: `size` maps
+ * onto the nearest `aspect_ratio`, and `quality` folds into grok's low/medium
+ * pair (`high` → `medium`, `auto` → provider default).
+ */
+export declare function buildGrokImageGenerateBody(args: ImageGenerateArgs): GrokImageGenerateRequestBody;
 /** One generated image decoded from the response. */
 export interface GeneratedImage {
     /** PNG bytes. */
@@ -59,8 +87,16 @@ export interface GeneratedImage {
  * payload carries no usable `b64_json` entries.
  */
 export declare function parseImageGenerateResponse(payload: unknown): GeneratedImage[];
-/** Directory the generated PNG files are written to. */
+/** Directory the generated image files are written to. */
 export declare function imagesDirectory(): string;
+/** Media types the attachment store accepts and this tool can produce. */
+export type GeneratedImageMediaType = 'image/png' | 'image/jpeg' | 'image/webp';
+/**
+ * Sniff a generated image's media type from its magic bytes (codex serves
+ * PNG; grok's format is undocumented, so trust the bytes). Unrecognized data
+ * defaults to PNG, matching the historical behavior.
+ */
+export declare function sniffImageMediaType(data: Buffer): GeneratedImageMediaType;
 /**
  * Build the `image_generate` tool definition.
  * @param options - codex session source, fetch implementation, and image directory.

package/lib/tools/image-generate.js

@@ -1,12 +1,16 @@
 /**
- * `image_generate` tool: generate images through the ChatGPT/Codex
- * subscription's image endpoint, save them as PNG files under the harness
- * home, and — when the deployment mounts an attachment store and the calling
- * route declares image input — also commit the bytes as durable attachments
- * so the images render inline and enter model context (the same path
- * `read_image` uses). Mirrors codex-rs `codex-api/src/images.rs`: POST
- * `/backend-api/codex/images/generations` with the responses call's auth
- * headers; the response carries base64 PNG data.
+ * `image_generate` tool: generate images through a subscription image
+ * endpoint, save them under the harness home, and — when the deployment
+ * mounts an attachment store and the calling route declares image input —
+ * also commit the bytes as durable attachments so the images render inline
+ * and enter model context (the same path `read_image` uses).
+ *
+ * Provider selection: the `provider` argument names the preferred provider
+ * (default `gpt`, i.e. the ChatGPT/Codex subscription serving gpt-image-2 —
+ * mirrors codex-rs `codex-api/src/images.rs`); when the preferred one is
+ * logged out the other serves as fallback (`grok` is grok-imagine-image-2.0
+ * via `api.x.ai/v1/images/generations` with `response_format: 'b64_json'`).
+ * Both answer the OpenAI images shape (`data[].b64_json`).
  */
 import { mkdir, writeFile } from 'node:fs/promises';
 import { basename, join } from 'node:path';
@@ -15,13 +19,17 @@ import { AttachmentId } from '@deepseek-ai/dsh-attachment';
 import { createUserMessage } from '@deepseek-ai/dsh-llm';
 import { defineTool } from '@deepseek-ai/dsh-tools';
 import { httpLlmError, TokenManager } from '../providers/common.js';
-/** Endpoint the generation request is posted to. */
+/** Endpoint the codex generation request is posted to. */
 export const IMAGE_GENERATE_URL = 'https://chatgpt.com/backend-api/codex/images/generations';
 /** The image model the codex subscription endpoint serves. */
 export const IMAGE_GENERATE_MODEL = 'gpt-image-2';
+/** Endpoint the grok generation request is posted to. */
+export const GROK_IMAGE_GENERATE_URL = 'https://api.x.ai/v1/images/generations';
+/** The image model the grok subscription endpoint serves. */
+export const GROK_IMAGE_GENERATE_MODEL = 'grok-imagine-image-2.0';
 /**
- * Assemble the request body from tool arguments (hand-checks the non-empty
- * prompt the schema DSL cannot express).
+ * Assemble the codex request body from tool arguments (hand-checks the
+ * non-empty prompt the schema DSL cannot express).
  */
 export function buildImageGenerateBody(args) {
     const prompt = args.prompt.trim();
@@ -34,6 +42,33 @@ export function buildImageGenerateBody(args) {
         ...args.quality === undefined ? {} : { quality: args.quality },
     };
 }
+/** The codex `size` values mapped onto grok aspect ratios. */
+const GROK_ASPECT_RATIOS = {
+    '1024x1024': '1:1',
+    '1024x1536': '2:3',
+    '1536x1024': '3:2',
+    'auto': 'auto',
+};
+/**
+ * Assemble the grok request body from the same tool arguments: `size` maps
+ * onto the nearest `aspect_ratio`, and `quality` folds into grok's low/medium
+ * pair (`high` → `medium`, `auto` → provider default).
+ */
+export function buildGrokImageGenerateBody(args) {
+    const prompt = args.prompt.trim();
+    if (prompt.length === 0)
+        throw new Error('image_generate: prompt must be a non-empty string');
+    const quality = args.quality === 'low' ? 'low'
+        : args.quality === 'medium' || args.quality === 'high' ? 'medium'
+            : undefined;
+    return {
+        prompt,
+        model: GROK_IMAGE_GENERATE_MODEL,
+        response_format: 'b64_json',
+        ...args.size === undefined ? {} : { aspect_ratio: GROK_ASPECT_RATIOS[args.size] },
+        ...quality === undefined ? {} : { quality },
+    };
+}
 /**
  * Parse the generations response into decodable images. Throws when the
  * payload carries no usable `b64_json` entries.
@@ -59,14 +94,33 @@ export function parseImageGenerateResponse(payload) {
         throw new Error('image_generate: the response carried no image data');
     return images;
 }
-/** Directory the generated PNG files are written to. */
+/** Directory the generated image files are written to. */
 export function imagesDirectory() {
     return dshHomePath('plugins', 'subscriptions', 'images');
 }
+/**
+ * Sniff a generated image's media type from its magic bytes (codex serves
+ * PNG; grok's format is undocumented, so trust the bytes). Unrecognized data
+ * defaults to PNG, matching the historical behavior.
+ */
+export function sniffImageMediaType(data) {
+    if (data.length >= 3 && data[0] === 0xff && data[1] === 0xd8 && data[2] === 0xff)
+        return 'image/jpeg';
+    if (data.length >= 12 && data.toString('latin1', 0, 4) === 'RIFF' && data.toString('latin1', 8, 12) === 'WEBP') {
+        return 'image/webp';
+    }
+    return 'image/png';
+}
+/** File extension for one sniffed media type. */
+const MEDIA_TYPE_EXTENSIONS = {
+    'image/png': 'png',
+    'image/jpeg': 'jpg',
+    'image/webp': 'webp',
+};
 /** Timestamped, collision-safe file name for one generated image. */
-function imageFileName(index) {
+function imageFileName(index, mediaType) {
     const stamp = new Date().toISOString().replace(/[:.]/g, '-');
-    return `image-${stamp}-${Math.random().toString(36).slice(2, 8)}-${index}.png`;
+    return `image-${stamp}-${Math.random().toString(36).slice(2, 8)}-${index}.${MEDIA_TYPE_EXTENSIONS[mediaType]}`;
 }
 /** Bound a call-card title's prompt. */
 function truncate(text, max = 60) {
@@ -127,7 +181,10 @@ function imageGenerateText(value) {
 export function createImageGenerateTool(options) {
     return defineTool({
         name: 'image_generate',
-        description: 'Generate an image with the ChatGPT subscription (gpt-image-2) and save it as a PNG file. '
+        description: 'Generate an image with the ChatGPT subscription (gpt-image-2) or the Grok '
+            + 'subscription (grok-imagine-image-2.0) and save it as an image file. The `provider` '
+            + 'parameter picks the preferred provider (default gpt); when the preferred one is logged '
+            + 'out the other serves as fallback. '
             + 'Returns the saved file paths; on image-capable models the image itself is attached.',
         parameters: {
             prompt: { type: 'string', required: true, description: 'What the image should show.' },
@@ -141,6 +198,11 @@ export function createImageGenerateTool(options) {
                 enum: ['low', 'medium', 'high', 'auto'],
                 description: 'Rendering quality; omit for the provider default.',
             },
+            provider: {
+                type: 'string',
+                enum: ['gpt', 'grok'],
+                description: 'Preferred provider (default gpt); the other one serves as fallback when the preferred is logged out.',
+            },
         },
         output: {
             schema: {
@@ -180,30 +242,67 @@ export function createImageGenerateTool(options) {
             content: result.content.filter(block => block.type === 'text'),
         }),
         async execute(args, exec) {
-            const body = buildImageGenerateBody(args);
-            const session = await options.tokens.session();
-            const response = await (options.fetchFn ?? fetch)(IMAGE_GENERATE_URL, {
-                method: 'POST',
-                headers: {
-                    'authorization': `Bearer ${session.accessToken}`,
-                    'chatgpt-account-id': session.accountId,
-                    'originator': 'codex_cli_rs',
-                    'content-type': 'application/json',
-                    'accept': 'application/json',
-                },
-                body: JSON.stringify(body),
-                signal: exec.signal,
-            });
+            const fetchFn = options.fetchFn ?? fetch;
+            // Provider selection: the preferred provider (default gpt) when logged
+            // in, the other one as the fallback. A configured-but-logged-out manager
+            // still resolves through `session()` below so the standard log-in hint
+            // surfaces.
+            const preferGrok = args.provider === 'grok';
+            const codexReady = options.codexTokens !== undefined && await options.codexTokens.hasSession();
+            const grokReady = options.grokTokens !== undefined && await options.grokTokens.hasSession();
+            const useGrok = preferGrok ? grokReady : grokReady && !codexReady;
+            const useCodex = !useGrok && codexReady;
+            let response;
+            if (useCodex && options.codexTokens !== undefined) {
+                const session = await options.codexTokens.session();
+                response = await fetchFn(IMAGE_GENERATE_URL, {
+                    method: 'POST',
+                    headers: {
+                        'authorization': `Bearer ${session.accessToken}`,
+                        'chatgpt-account-id': session.accountId,
+                        'originator': 'codex_cli_rs',
+                        'content-type': 'application/json',
+                        'accept': 'application/json',
+                    },
+                    body: JSON.stringify(buildImageGenerateBody(args)),
+                    signal: exec.signal,
+                });
+            }
+            else if (useGrok && options.grokTokens !== undefined) {
+                const session = await options.grokTokens.session();
+                response = await fetchFn(GROK_IMAGE_GENERATE_URL, {
+                    method: 'POST',
+                    headers: {
+                        'authorization': `Bearer ${session.accessToken}`,
+                        'content-type': 'application/json',
+                        'accept': 'application/json',
+                    },
+                    body: JSON.stringify(buildGrokImageGenerateBody(args)),
+                    signal: exec.signal,
+                });
+            }
+            else {
+                const manager = preferGrok
+                    ? options.grokTokens ?? options.codexTokens
+                    : options.codexTokens ?? options.grokTokens;
+                if (manager === undefined)
+                    throw new Error('image_generate: no image provider is configured');
+                await manager.session(); // logged out: throws the provider's log-in hint
+                throw new Error('image_generate: no image provider is logged in');
+            }
             if (!response.ok)
                 throw await httpLlmError(response, 'image_generate');
             const images = parseImageGenerateResponse(await response.json());
             const directory = options.imagesDir ?? imagesDirectory();
             await mkdir(directory, { recursive: true });
             const paths = [];
+            const mediaTypes = [];
             for (const [index, image] of images.entries()) {
-                const path = join(directory, imageFileName(index));
+                const mediaType = sniffImageMediaType(image.data);
+                const path = join(directory, imageFileName(index, mediaType));
                 await writeFile(path, image.data);
                 paths.push(path);
+                mediaTypes.push(mediaType);
             }
             // Inline display requires durable attachment references, and those may
             // only enter session history on a route that declares image input.
@@ -216,7 +315,7 @@ export function createImageGenerateTool(options) {
                 for (const [index, image] of images.entries()) {
                     const ref = await attachments.saveImage({
                         data: image.data,
-                        mediaType: 'image/png',
+                        mediaType: mediaTypes[index],
                         name: basename(paths[index]),
                     });
                     refs.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-subscriptions",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Use ChatGPT (Codex), Claude, and Grok (X Premium) subscriptions as DeepSeek Harness LLM providers, with OAuth login from the web Settings page",
   "license": "MIT",
   "repository": {