codex-copilot-dx 0.7.8 → 0.7.9

package/README.md

@@ -147,7 +147,9 @@ ccdx enable-image
 
 The command asks for an HTTPS `/images/generations` endpoint and an API key without echoing the key. It reads the endpoint's `/models` catalog, detects either the standard OpenAI Images request format or the supported `input.messages` format, and asks for a numeric model selection only when multiple image models are available. Its validation request omits the prompt and does not generate an image.
 
-The provider credential is stored in `~/.config/codex-copilot-dx/image-provider.json`, or under `XDG_CONFIG_HOME`, with mode `0600`. The API key is never written to `~/.codex/config.toml`; that file receives only a marked local MCP entry pointing to the running CCDX adapter with a 210-second tool timeout. Restart Codex App after enabling so it loads the tool. The existing CCDX adapter can remain running because provider settings are loaded when the tool is invoked.
+The provider credential is stored in `~/.config/codex-copilot-dx/image-provider.json`, or under `XDG_CONFIG_HOME`, with mode `0600`. The API key is never written to `~/.codex/config.toml`; that file receives only a marked local MCP entry pointing to the running CCDX adapter with a 210-second tool timeout. Enabling also installs CCDX-owned `ccdx-image` guidance under `~/.codex/skills`, with a self-contained Node helper. Codex uses the MCP tool directly, including through deferred tool search; an already-open task without that tool can use the helper to call the same local service and display the saved image. Neither route requires Python, an OpenAI SDK, or copying credentials. The original built-in imagegen skill remains available for capabilities such as editing and reference images.
+
+The enable command verifies the local MCP handshake and generation-tool directory without generating an image. It reports provider configuration separately from local service readiness; it cannot assert that every running Codex task has refreshed its catalog. Codex normally detects changed skills; restart Codex App once if an open task has not refreshed them. Normal CCDX startup installs or updates this guidance for providers already enabled in 0.7.8, without repeating API setup. Unchanged guidance is not rewritten. The existing adapter can remain running because provider settings are loaded when the tool is invoked.
 
 Inspect or disable the optional provider with:
 
@@ -156,7 +158,7 @@ ccdx image-status
 ccdx disable-image
 ```
 
-`image-status` never prints the API key. Disabling removes the stored provider credential and the CCDX-owned MCP block; restart Codex App to remove the tool from already running tasks. The image endpoint is contacted only by `enable-image` validation and by explicit `generate_image` tool calls. Ordinary Responses, models, authentication, Fast, Auto-review, compaction, and image-input paths remain on their existing routes.
+`image-status` never prints the API key and performs only a local, non-generating tool-readiness check. Disabling removes the stored provider credential, the CCDX-owned MCP block, and unmodified CCDX image guidance; user-modified skill files are preserved. Cached tool calls then fail closed. The Node helper creates a new file under the task's `output/imagegen` directory by default and reports its absolute path; it never overwrites an existing file or automatically repeats a failed generation. The image endpoint is contacted only by `enable-image` validation and by explicit `generate_image` tool calls. Ordinary Responses, models, authentication, Fast, Auto-review, compaction, and image-input paths remain on their existing routes.
 
 Generated image downloads must use public HTTPS addresses, do not follow redirects, are DNS-checked against private and reserved addresses, and are capped at 32 MiB. The local MCP route accepts calls only from the same device and permits at most two concurrent generations. The tool supports new-image generation at `1024x1024`, `1536x1024`, or `1024x1536`; it does not claim image editing or multi-turn image editing support.
 

package/bin/cli.mjs

@@ -214,10 +214,7 @@ async function reuseRunningAdapterIfAvailable() {
   if (!running.ok) return false;
 
   console.log(status("ok", `Using existing adapter at ${running.baseUrl}`));
-  ensureCodexConfig(ADAPTER_PORT, {
-    host: ADAPTER_HOST,
-    imageProviderEnabled: Boolean(readImageProviderConfig()),
-  });
+  await configureCodexClient();
 
   await openCodex();
   console.log(`
@@ -230,6 +227,19 @@ async function reuseRunningAdapterIfAvailable() {
   return true;
 }
 
+async function configureCodexClient() {
+  const imageProviderEnabled = Boolean(readImageProviderConfig());
+  ensureCodexConfig(ADAPTER_PORT, { host: ADAPTER_HOST, imageProviderEnabled });
+  if (imageProviderEnabled) {
+    try {
+      const { syncEnabledImageSkill } = await import("../src/cli-image.mjs");
+      syncEnabledImageSkill({ adapterPort: ADAPTER_PORT, adapterHost: ADAPTER_HOST });
+    } catch (error) {
+      console.warn(status("warn", `Image guidance could not be updated: ${error.message}`));
+    }
+  }
+}
+
 if (CLI.command === "doctor") {
   const checks = await runDoctor({
     commandName: CLI_NAME,
@@ -298,10 +308,7 @@ try {
   });
 
   // Point Codex App at the adapter.
-  ensureCodexConfig(ADAPTER_PORT, {
-    host: ADAPTER_HOST,
-    imageProviderEnabled: Boolean(readImageProviderConfig()),
-  });
+  await configureCodexClient();
 
   // Launch Codex when available.
   await openCodex();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-copilot-dx",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "Use Codex App with GitHub Copilot",
   "author": "Dale Xiao",
   "type": "module",

package/src/cli-image.mjs

@@ -6,6 +6,8 @@ import { createInterface } from "node:readline/promises";
 import { atomicWriteFilePairSync } from "./atomic-file.mjs";
 import { terminalCell } from "./cli-table.mjs";
 import { computeImageMcpCodexConfig } from "./config.mjs";
+import { probeImageTool } from "./image-readiness.mjs";
+import { updateImageSkill } from "./image-skill.mjs";
 import {
   imageProviderConfigPath,
   inspectImageProvider,
@@ -103,13 +105,19 @@ function enableImageProvider({ providerConfig, providerPath, codexPath, codexCon
     adapterHost,
   });
   const normalized = validateImageProviderConfig(providerConfig, { filePath: providerPath });
-  atomicWriteFilePairSync(
-    codexPath,
-    codex.content,
-    providerPath,
-    `${JSON.stringify(normalized, null, 2)}\n`,
-    { mode: 0o600 },
-  );
+  const skill = updateImageSkill({ enabled: true, codexPath, adapterPort, adapterHost });
+  try {
+    atomicWriteFilePairSync(
+      codexPath,
+      codex.content,
+      providerPath,
+      `${JSON.stringify(normalized, null, 2)}\n`,
+      { mode: 0o600 },
+    );
+  } catch (error) {
+    skill.rollback();
+    throw error;
+  }
   return { codexChanged: codex.changed, config: normalized };
 }
 
@@ -120,12 +128,27 @@ function disableImageProvider({ providerPath, codexPath, codexContent, adapterPo
     adapterHost,
   });
   const providerExists = fs.existsSync(providerPath);
-  if (fs.existsSync(codexPath)) {
-    atomicWriteFilePairSync(codexPath, codex.content, providerPath, null, { mode: 0o600 });
-  } else if (providerExists) {
-    fs.unlinkSync(providerPath);
+  const skill = updateImageSkill({ enabled: false, codexPath, adapterPort, adapterHost });
+  try {
+    if (fs.existsSync(codexPath)) {
+      atomicWriteFilePairSync(codexPath, codex.content, providerPath, null, { mode: 0o600 });
+    } else if (providerExists) {
+      fs.unlinkSync(providerPath);
+    }
+  } catch (error) {
+    skill.rollback();
+    throw error;
   }
-  return { changed: providerExists || codex.changed };
+  return { changed: providerExists || codex.changed || skill.changed, preservedGuidance: Boolean(skill.preserved) };
+}
+
+export function syncEnabledImageSkill({ home = os.homedir(), codexPath = defaultCodexConfigPath(home), ...options } = {}) {
+  return updateImageSkill({ ...options, enabled: true, codexPath });
+}
+
+function printImageReadiness(readiness, output, commandName) {
+  if (readiness.ready) output.write("Local image service: ready (generation tool verified; no image generated).\n");
+  else output.write(`Local image service: unavailable (${readiness.reason}). Start or restart ${commandName} to use images.\n`);
 }
 
 export async function runImageCommand({
@@ -138,6 +161,7 @@ export async function runImageCommand({
   prompt,
   promptSecret,
   fetchImpl = fetch,
+  probeFetchImpl = fetch,
   adapterPort = 2026,
   adapterHost = "127.0.0.1",
   codexPath = defaultCodexConfigPath(home),
@@ -151,14 +175,18 @@ export async function runImageCommand({
     }
     const summary = configSummary(config);
     output.write(`Image generation: enabled\nEndpoint: ${terminalCell(summary.endpoint)}\nModel: ${terminalCell(summary.model)}\nProtocol: ${terminalCell(summary.protocol)}\n`);
-    return { enabled: true, ...summary };
+    const readiness = await probeImageTool(fileContent(codexPath), { fetchImpl: probeFetchImpl });
+    printImageReadiness(readiness, output, commandName);
+    return { enabled: true, ...summary, readiness };
   }
 
   const codexContent = fileContent(codexPath);
   if (action === "disable") {
     const result = disableImageProvider({ providerPath, codexPath, codexContent, adapterPort, adapterHost });
     output.write(`${result.changed ? "Disabled" : "Kept disabled"} image generation.\n`);
-    output.write("Restart Codex App to remove the image tool from active tasks.\n");
+    output.write(result.preservedGuidance
+      ? "Kept user-modified image guidance. Existing image tool calls are now disabled.\n"
+      : "Removed CCDX image guidance. Existing image tool calls are now disabled.\n");
     return { enabled: false, ...result };
   }
   if (action !== "enable") throw new Error(`Unknown image command action: ${action}`);
@@ -194,6 +222,9 @@ export async function runImageCommand({
     adapterHost,
   });
   output.write(`Enabled image generation with ${terminalCell(model)}.\n`);
-  output.write("Restart Codex App to load the image tool. A running ccdx adapter can remain running.\n");
-  return { enabled: true, ...configSummary(result.config), codexChanged: result.codexChanged };
+  const readiness = await probeImageTool(fileContent(codexPath), { fetchImpl: probeFetchImpl });
+  printImageReadiness(readiness, output, commandName);
+  output.write("Installed CCDX image guidance for new and existing tasks. Ask Codex to draw an image.\n");
+  output.write("If the open task has not refreshed its skills, restart Codex App once.\n");
+  return { enabled: true, ...configSummary(result.config), codexChanged: result.codexChanged, readiness };
 }

package/src/cli-options.mjs

@@ -302,9 +302,9 @@ function topicHelp(name, topic) {
     models: `Usage:\n  ${name} models [--format table|plain]\n\nPerforms a fresh, read-only Copilot model-directory lookup for the saved account. Interactive terminals use a table by default.`,
     usage: `Usage:\n  ${name} usage [--format table|plain]\n\nSummarizes local token usage metadata without reading prompt or completion content. Interactive terminals use a table by default.`,
     animation: `Usage:\n  ${name} animation\n\nInteractively selects the terminal activity animation used the next time the adapter starts.`,
-    "enable-image": `Usage:\n  ${name} enable-image\n\nInteractively configures an HTTPS image API endpoint and API key, detects its supported image model and protocol, and registers the local CCDX image tool for Codex App.`,
-    "disable-image": `Usage:\n  ${name} disable-image\n\nDisables the local CCDX image tool and removes its stored API credential.`,
-    "image-status": `Usage:\n  ${name} image-status\n\nShows whether the optional image provider is configured without exposing its API key.`,
+    "enable-image": `Usage:\n  ${name} enable-image\n\nInteractively configures an HTTPS image API endpoint and API key, detects its supported image model and protocol, installs CCDX image guidance, and checks the local image tool for Codex App without generating an image.`,
+    "disable-image": `Usage:\n  ${name} disable-image\n\nDisables the local CCDX image tool and removes its stored API credential and unmodified CCDX image guidance.`,
+    "image-status": `Usage:\n  ${name} image-status\n\nShows provider configuration and probes local image-tool readiness without generating an image or exposing its API key.`,
     "auto-review-model": `Usage:\n  ${name} auto-review-model\n\nInteractively selects an advertised Responses model for Codex Auto-review.`,
     update: `Usage:\n  ${name} update [npm|github]\n\nUpdates the global package from the configured npm registry or GitHub main. With no source, an interactive terminal prompts for one.`,
     version: `Usage:\n  ${name} --version`,

package/src/image-mcp.mjs

@@ -42,7 +42,7 @@ function imageTool() {
   return {
     name: IMAGE_TOOL_NAME,
     title: "Generate image",
-    description: "Generate a new image from a detailed text prompt. Use this when the user asks to create, draw, render, or generate an image. This tool does not edit an existing image.",
+    description: "Generate a new image with the image provider the user enabled in CCDX. Call directly for text-to-image requests; returns the image inline. Credentials and generation are handled by CCDX, with no Python or OpenAI SDK setup. Does not edit or take reference images.",
     inputSchema: {
       type: "object",
       properties: {
@@ -113,7 +113,9 @@ export function createImageMcpHandler({
         protocolVersion: MCP_PROTOCOL_VERSIONS.has(requestedVersion) ? requestedVersion : MCP_PROTOCOL_VERSION,
         capabilities: { tools: { listChanged: false } },
         serverInfo: { name: "ccdx-image", version: "1" },
-        instructions: "Use generate_image only when the user asks to create a new image.",
+        instructions: configLoader()
+          ? "The user enabled CCDX as their image provider. For new text-to-image requests, call generate_image directly and display the returned image. CCDX handles credentials and the API; no Python, SDK installation, OPENAI_API_KEY, or alternate endpoint is needed. Follow the user's image request; do not retry a failed generation automatically. Editing and reference-image requests require a different capable tool."
+          : "Image generation is disabled. Enable it with ccdx enable-image before requesting images.",
       });
       return;
     }

package/src/image-readiness.mjs

@@ -0,0 +1,55 @@
+import os from "node:os";
+import { parse } from "smol-toml";
+import { readBoundedResponseText } from "./http-transport.mjs";
+
+export async function probeImageTool(codexContent, { fetchImpl = fetch, timeoutMs = 1500 } = {}) {
+  let server;
+  let url;
+  try {
+    server = parse(codexContent).mcp_servers?.ccdx_image;
+    if (!server || server.enabled === false) return { ready: false, reason: "not_configured" };
+    url = new URL(server.url);
+    const host = url.hostname.replace(/^\[|\]$/g, "");
+    const local = ["localhost", "127.0.0.1", "::1", ...Object.values(os.networkInterfaces())
+      .flat().filter(Boolean).map((entry) => entry.address)];
+    if (url.protocol !== "http:" || !local.includes(host) || url.username || url.password
+      || url.pathname !== "/mcp/image" || url.search || url.hash) {
+      return { ready: false, reason: "invalid_local_endpoint" };
+    }
+  } catch {
+    return { ready: false, reason: "invalid_config" };
+  }
+  const signal = AbortSignal.timeout(timeoutMs);
+  const headers = { "Content-Type": "application/json", Accept: "application/json, text/event-stream" };
+  async function rpc(id, method, params) {
+    const response = await fetchImpl(url.href, {
+      method: "POST", headers, signal, redirect: "error",
+      body: JSON.stringify({ jsonrpc: "2.0", ...(id === undefined ? {} : { id }), method, params }),
+    });
+    if (!response.ok) {
+      await response.body?.cancel?.().catch(() => {});
+      throw new Error(`HTTP ${response.status}`);
+    }
+    if (id === undefined) {
+      await response.body?.cancel?.().catch(() => {});
+      return;
+    }
+    const text = await readBoundedResponseText(response, { maxBytes: 64 * 1024, signal, label: "Image tool catalog" });
+    const message = JSON.parse(text);
+    if (message.jsonrpc !== "2.0" || message.id !== id || message.error) throw new Error("invalid MCP response");
+    return message.result;
+  }
+  try {
+    const initialized = await rpc(1, "initialize", {
+      protocolVersion: "2025-06-18", capabilities: {}, clientInfo: { name: "ccdx-image-status", version: "1" },
+    });
+    if (initialized?.serverInfo?.name !== "ccdx-image") return { ready: false, reason: "unexpected_server" };
+    await rpc(undefined, "notifications/initialized", {});
+    const result = await rpc(2, "tools/list", {});
+    return result?.tools?.some((tool) => tool.name === "generate_image")
+      ? { ready: true }
+      : { ready: false, reason: "tool_unavailable" };
+  } catch (error) {
+    return { ready: false, reason: signal.aborted ? "timeout" : /^HTTP \d+$/.test(error.message) ? error.message : "unreachable" };
+  }
+}

package/src/image-skill.mjs

@@ -0,0 +1,143 @@
+import fs from "node:fs";
+import path from "node:path";
+import { createHash } from "node:crypto";
+import { atomicWriteFilePairSync, atomicWriteFileSync } from "./atomic-file.mjs";
+import { adapterBaseUrl } from "./running-adapter.mjs";
+
+const SKILL_MARKER = /<!-- ccdx:image-skill:([a-f0-9]{64}) -->\n/;
+const HELPER_MARKER = /^\/\/ ccdx:image-helper:([a-f0-9]{64})\n/;
+
+function digest(content) {
+  return createHash("sha256").update(content).digest("hex");
+}
+
+function quote(value) {
+  return `'${String(value).replaceAll("'", "'\\''")}'`;
+}
+
+function conflict(message) {
+  return Object.assign(new Error(message), { code: "CCDX_IMAGE_SKILL_CONFLICT" });
+}
+
+function directoryCheck(directory) {
+  try {
+    if (!fs.lstatSync(directory).isDirectory()) throw conflict(`CCDX image skill path is not a regular directory: ${directory}`);
+  } catch (error) {
+    if (error?.code !== "ENOENT") throw error;
+  }
+}
+
+function ownedSnapshot(filePath, marker, preserveUnowned = false) {
+  try {
+    const stat = fs.lstatSync(filePath);
+    if (!stat.isFile()) throw conflict(`Refusing to replace an unowned CCDX image skill path: ${filePath}`);
+    const content = fs.readFileSync(filePath, "utf8");
+    const match = marker.exec(content);
+    if (!match || digest(content.replace(marker, "")) !== match[1]) {
+      throw conflict(`Preserving an existing or modified image skill file: ${filePath}`);
+    }
+    return { content, mode: stat.mode & 0o777 };
+  } catch (error) {
+    if (error?.code === "ENOENT") return null;
+    if (preserveUnowned && error?.code === "CCDX_IMAGE_SKILL_CONFLICT") return { unowned: true };
+    throw error;
+  }
+}
+
+function removeFile(filePath) {
+  try { fs.unlinkSync(filePath); }
+  catch (error) { if (error?.code !== "ENOENT") throw error; }
+}
+
+function removeEmptyDirectories(skillDirectory) {
+  for (const directory of [path.join(skillDirectory, "scripts"), skillDirectory]) {
+    try { fs.rmdirSync(directory); }
+    catch (error) { if (!["ENOENT", "ENOTEMPTY", "EEXIST"].includes(error?.code)) throw error; }
+  }
+}
+
+export function updateImageSkill({
+  enabled,
+  codexPath,
+  adapterPort = 2026,
+  adapterHost = "127.0.0.1",
+  nodePath = process.execPath,
+} = {}) {
+  const skillDirectory = path.join(path.dirname(codexPath), "skills", "ccdx-image");
+  const skillPath = path.join(skillDirectory, "SKILL.md");
+  const helperPath = path.join(skillDirectory, "scripts", "generate.mjs");
+  try {
+    directoryCheck(skillDirectory);
+    directoryCheck(path.dirname(helperPath));
+  } catch (error) {
+    if (!enabled && error?.code === "CCDX_IMAGE_SKILL_CONFLICT") {
+      return { changed: false, preserved: true, skillPath, rollback: () => {} };
+    }
+    throw error;
+  }
+  const previousSkill = ownedSnapshot(skillPath, SKILL_MARKER, !enabled);
+  const previousHelper = ownedSnapshot(helperPath, HELPER_MARKER, !enabled);
+  const touched = [];
+  let rolledBack = false;
+  const rollback = () => {
+    if (rolledBack) return;
+    for (const [filePath, snapshot] of touched) {
+      if (snapshot) atomicWriteFileSync(filePath, snapshot.content, { mode: snapshot.mode, preserveMode: false });
+      else removeFile(filePath);
+    }
+    removeEmptyDirectories(skillDirectory);
+    rolledBack = true;
+  };
+  if (!enabled) {
+    const preserved = Boolean(previousSkill?.unowned || previousHelper?.unowned);
+    if (!previousSkill?.content && !previousHelper?.content) return { changed: false, preserved, skillPath, rollback: () => {} };
+    try {
+      for (const [filePath, snapshot] of [[skillPath, previousSkill], [helperPath, previousHelper]]) {
+        if (!snapshot?.content) continue;
+        touched.push([filePath, snapshot]);
+        removeFile(filePath);
+      }
+      removeEmptyDirectories(skillDirectory);
+    } catch (error) {
+      rollback();
+      throw error;
+    }
+    return { changed: true, preserved, skillPath, rollback };
+  }
+  const host = ["0.0.0.0", "::", "[::]"].includes(adapterHost) ? (adapterHost === "0.0.0.0" ? "127.0.0.1" : "::1") : adapterHost;
+  const endpoint = `${adapterBaseUrl(host, adapterPort)}/mcp/image`;
+  const skillBody = `---
+name: ccdx-image
+description: Generate new images from text using the user's configured CCDX image provider. Use for requests to draw, create, or render a new image. Excludes editing existing images, image references, transparent output, and code-native SVG or diagrams.
+---
+
+# CCDX image generation
+
+The user enabled this provider through ccdx enable-image. For new text-to-image requests, use the configured CCDX provider directly.
+
+Use the ccdx_image server's generate_image tool when available. Supply a complete prompt and one size: 1024x1024 (square), 1536x1024 (landscape), or 1024x1536 (portrait). Display its returned image. No Python, SDK installation, extra API key, or provider discovery is needed.
+
+If the tool is not directly callable and the host provides tool search, make one targeted search for ccdx_image generate_image and use the tool if it becomes callable. If it is still unavailable, run the bundled Node helper once:
+
+\`\`\`sh
+${quote(nodePath)} ${quote(helperPath)} --prompt 'A complete image prompt' --size 1024x1024
+\`\`\`
+
+Quote the actual prompt safely for the shell. The helper uses the same local CCDX service and prints the saved absolute image path. An optional --out argument selects a new output file; existing files are never overwritten. Inspect and display the saved image with the available image viewer or an absolute-path Markdown image.
+
+The helper needs loopback HTTP access. If the task reports restricted network access, use the execution tool's normal permission-request mechanism for this exact command before running it; localhost is also restricted. Keep the host's approval policy unchanged.
+
+Only use the helper when the MCP tool is absent, not after a generation fails or times out: the first request may already have consumed a generation. A helper error explicitly saying generation has not started means no generation was submitted; resolve its stated local connection or permission issue before trying again. Otherwise report the failure once without switching providers, installing dependencies, or repeating generation.
+
+This provider supports text-to-image only. For edits, reference images, transparent output, or explicitly requested other providers, keep the relevant native tools and skills; do not substitute a fresh CCDX generation.
+`;
+  const skillContent = skillBody.replace("# CCDX image generation", `<!-- ccdx:image-skill:${digest(skillBody)} -->\n# CCDX image generation`);
+  const helperBody = `${fs.readFileSync(new URL("./image-tool-client.mjs", import.meta.url), "utf8")}\ntry {\n  await runImageToolClient({ endpoint: ${JSON.stringify(endpoint)} });\n} catch (error) {\n  console.error(String(error?.message || "Image generation failed").replace(/[\\u0000-\\u001f\\u007f-\\u009f]/g, " ").slice(0, 1000));\n  process.exitCode = 1;\n}\n`;
+  const helperContent = `// ccdx:image-helper:${digest(helperBody)}\n${helperBody}`;
+  if (previousSkill?.content === skillContent && previousHelper?.content === helperContent) {
+    return { changed: false, skillPath, rollback: () => {} };
+  }
+  atomicWriteFilePairSync(helperPath, helperContent, skillPath, skillContent, { mode: 0o600 });
+  touched.push([helperPath, previousHelper], [skillPath, previousSkill]);
+  return { changed: true, skillPath, rollback };
+}

package/src/image-tool-client.mjs

@@ -0,0 +1,141 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { randomUUID } from "node:crypto";
+
+const IMAGE_SIZES = new Set(["1024x1024", "1536x1024", "1024x1536"]);
+const IMAGE_EXTENSIONS = new Map([["image/png", ".png"], ["image/jpeg", ".jpg"], ["image/webp", ".webp"]]);
+const MAX_IMAGE_BYTES = 32 * 1024 * 1024;
+const MAX_RESPONSE_BYTES = 48 * 1024 * 1024;
+const USAGE = "Usage: generate.mjs --prompt <text> [--size 1024x1024|1536x1024|1024x1536] [--out <new-file>]";
+
+export function parseImageToolArgs(args = []) {
+  if (args.length === 1 && ["--help", "-h"].includes(args[0])) return { help: true };
+  const values = {};
+  for (let index = 0; index < args.length; index += 2) {
+    const option = args[index];
+    if (!["--prompt", "--size", "--out"].includes(option) || option in values) throw new Error(USAGE);
+    if (typeof args[index + 1] !== "string" || !args[index + 1].trim()) throw new Error(`Missing value for ${option}`);
+    values[option] = args[index + 1];
+  }
+  const prompt = String(values["--prompt"] || "").trim();
+  if (!prompt || prompt.length > 16_000) throw new Error("Image prompt must contain 1 to 16000 characters");
+  const size = String(values["--size"] || "1024x1024").trim().toLowerCase();
+  if (!IMAGE_SIZES.has(size)) throw new Error("Unsupported image size");
+  return { prompt, size, out: values["--out"] };
+}
+
+function localImageEndpoint(value) {
+  const endpoint = new URL(value);
+  const host = endpoint.hostname.replace(/^\[|\]$/g, "");
+  const localAddresses = Object.values(os.networkInterfaces()).flat().filter(Boolean).map(({ address }) => address);
+  const local = host === "localhost" || host === "::1" || /^127\.\d+\.\d+\.\d+$/.test(host) || localAddresses.includes(host);
+  if (!local || endpoint.protocol !== "http:" || endpoint.username || endpoint.password
+    || endpoint.pathname !== "/mcp/image" || endpoint.search || endpoint.hash) {
+    throw new Error("The CCDX image helper requires the configured local /mcp/image endpoint");
+  }
+  return endpoint.href;
+}
+
+function cleanError(value) {
+  return String(value || "Image generation failed").replace(/[\u0000-\u001f\u007f-\u009f]/g, " ").slice(0, 1000);
+}
+
+async function readRpcResponse(response, expectedId) {
+  if (!response.ok) throw new Error(`CCDX image service returned HTTP ${response.status}`);
+  const declared = Number(response.headers.get("content-length"));
+  if (Number.isFinite(declared) && declared > MAX_RESPONSE_BYTES) {
+    await response.body?.cancel();
+    throw new Error("CCDX image response exceeds the size limit");
+  }
+  const chunks = [];
+  let bytes = 0;
+  for await (const chunk of response.body) {
+    bytes += chunk.byteLength;
+    if (bytes > MAX_RESPONSE_BYTES) throw new Error("CCDX image response exceeds the size limit");
+    chunks.push(Buffer.from(chunk));
+  }
+  let body;
+  try { body = JSON.parse(Buffer.concat(chunks, bytes).toString("utf8")); }
+  catch { throw new Error("CCDX image service returned invalid JSON"); }
+  if (body?.jsonrpc !== "2.0" || body.id !== expectedId) throw new Error("CCDX image service returned an invalid JSON-RPC response");
+  if (body.error) throw new Error(cleanError(body.error.message));
+  if (!body.result || typeof body.result !== "object") throw new Error("CCDX image service returned no result");
+  return body.result;
+}
+
+function assertNewOutput(filePath) {
+  try {
+    fs.lstatSync(filePath);
+    throw new Error(`Image output already exists: ${filePath}`);
+  } catch (error) {
+    if (error?.code !== "ENOENT") throw error;
+  }
+}
+
+export async function runImageToolClient({
+  endpoint,
+  args = process.argv.slice(2),
+  cwd = process.cwd(),
+  fetchImpl = fetch,
+  output = process.stdout,
+  signal = AbortSignal.timeout(210_000),
+} = {}) {
+  const options = parseImageToolArgs(args);
+  if (options.help) {
+    output.write(`${USAGE}\n`);
+    return null;
+  }
+  const url = localImageEndpoint(endpoint);
+  const requestedOutput = options.out ? path.resolve(cwd, options.out) : null;
+  if (requestedOutput) assertNewOutput(requestedOutput);
+  const directory = requestedOutput ? path.dirname(requestedOutput) : path.resolve(cwd, "output", "imagegen");
+  fs.mkdirSync(directory, { recursive: true });
+  fs.accessSync(directory, fs.constants.W_OK);
+  const headers = { "Content-Type": "application/json", Accept: "application/json, text/event-stream" };
+  const post = (body) => fetchImpl(url, {
+    method: "POST", headers, body: JSON.stringify(body), redirect: "error", signal,
+  });
+  try {
+    const initialized = await post({
+      jsonrpc: "2.0", id: 1, method: "initialize",
+      params: { protocolVersion: "2025-06-18", capabilities: {}, clientInfo: { name: "ccdx-image-helper", version: "1" } },
+    });
+    const sessionId = initialized.headers.get("mcp-session-id");
+    const server = await readRpcResponse(initialized, 1);
+    if (server.serverInfo?.name !== "ccdx-image") throw new Error("The configured local service is not CCDX image generation");
+    headers["MCP-Protocol-Version"] = server.protocolVersion || "2025-06-18";
+    if (sessionId) headers["Mcp-Session-Id"] = sessionId;
+    const notified = await post({ jsonrpc: "2.0", method: "notifications/initialized" });
+    await notified.body?.cancel();
+    if (!notified.ok) throw new Error(`CCDX image initialization returned HTTP ${notified.status}`);
+  } catch (error) {
+    const code = error.cause?.code || error.code;
+    const detail = ["EPERM", "EACCES"].includes(code)
+      ? "Local network access was denied. Request normal execution permission for this helper command."
+      : cleanError(error.message);
+    throw Object.assign(new Error(`Image generation has not started: ${detail}`), { code: "CCDX_IMAGE_NOT_STARTED" });
+  }
+  const result = await readRpcResponse(await post({
+    jsonrpc: "2.0", id: 2, method: "tools/call",
+    params: { name: "generate_image", arguments: { prompt: options.prompt, size: options.size } },
+  }), 2);
+  if (result.isError) {
+    throw new Error(cleanError(result.content?.find((part) => part.type === "text")?.text));
+  }
+  const image = result.content?.find((part) => part.type === "image");
+  const extension = IMAGE_EXTENSIONS.get(image?.mimeType);
+  if (!extension || typeof image.data !== "string" || !image.data
+    || image.data.length > Math.ceil(MAX_IMAGE_BYTES / 3) * 4
+    || !/^[A-Za-z0-9+/]+={0,2}$/.test(image.data)) {
+    throw new Error("CCDX image service returned an invalid image");
+  }
+  const bytes = Buffer.from(image.data, "base64");
+  if (!bytes.length || bytes.length > MAX_IMAGE_BYTES || bytes.toString("base64") !== image.data) {
+    throw new Error("CCDX image service returned an invalid image");
+  }
+  const filePath = requestedOutput || path.join(directory, `image-${randomUUID()}${extension}`);
+  fs.writeFileSync(filePath, bytes, { flag: "wx", mode: 0o600 });
+  output.write(`${filePath}\n`);
+  return filePath;
+}