ima2-gen 3.16.1 → 3.17.0

package/README.md

@@ -193,6 +193,7 @@ Grok video generation defaults to canonical `grok-imagine-video-1.5`; `grok-imag
 Image generation defaults to **`gpt-5.6-luna`** on the GPT lane. Prompt Builder backend selection is separate: **Auto** chooses the first ready supported text backend, while Settings can pin one explicitly. The `via <backend>` badge reports the backend that actually answered.
 
 - `gpt-5.6-luna` — current default image model on the GPT lane and the default GPT Builder model when that backend is selected.
+- `gpt-6-astra` — newest GPT image model; selectable, not the default.
 - `gpt-5.6-terra` / `gpt-5.6-sol` — current GPT-5.6 alternatives when your account exposes them.
 - `gpt-5.5`, `gpt-5.4`, `gpt-5.4-mini` — supported compatibility choices.
 
@@ -440,6 +441,34 @@ npm run build
 
 `npm run dev` builds the UI and starts the TypeScript server entry with `--watch` and verbose server diagnostics. `npm run typecheck`, `npm run build:server`, and `npm run build:cli` verify the TypeScript migration and package emit path. Node mode and Canvas Mode are part of the packaged UI by default.
 
+### Desktop app (Electron)
+
+`desktop/` wraps the same local server and UI in a menubar/tray app for macOS, Windows, and Linux. It supervises `server.js` as a child process (attaching to an already-running server on the configured port instead of starting a second one) and adds a native settings window: port, open at login, start hidden, menubar-only (macOS), keep-server-on-close, log level, config directory.
+
+```bash
+cd desktop
+npm install
+npm run prepare:app     # builds server + CLI + UI at the repo root
+npm start               # run unpackaged
+npm run dist:mac        # dmg + zip (arm64, x64)
+npm run dist:win        # nsis + zip
+npm run dist:linux      # AppImage + deb
+```
+
+Installers are produced by `.github/workflows/desktop.yml` on `desktop-v*` tag pushes, desktop PRs, or manual dispatch. PRs produce unsigned macOS previews without Apple credentials. Trusted macOS builds require `MAC_CSC_LINK`, `MAC_CSC_KEY_PASSWORD`, `APPLE_ID`, `APPLE_APP_SPECIFIC_PASSWORD`, and `APPLE_TEAM_ID`; missing or invalid authentication fails the build instead of producing an unsigned success.
+
+For a macOS-only verification build without publishing, run:
+
+```bash
+gh workflow run desktop.yml --ref <reviewed-branch> -f platform=mac -f publish=false
+```
+
+The workflow verifies Developer ID, team, architecture, hardened runtime, secure timestamp, nested signatures, Gatekeeper and stapled notarization tickets for both arm64 and x64. It checks the apps recovered from the final ZIP and DMG against the original signed content, then exports `ima2-macos-signature-proof` reports and installer SHA-256 hashes. Failed verification blocks installer upload. Manual dispatch with `publish=false` never publishes, even when its ref is a desktop tag; publishing a manual build requires `platform=all`.
+
+Signing credential imports run on disposable GitHub-hosted macOS. The builder cleans successfully imported keychains; if import/setup fails before its cleanup registration, runner destruction is the final cleanup boundary. Local recovery should reuse an existing login-keychain identity in the same unlocked session, rather than importing credential packages into a persistent machine. This does not require changing automatic locking or key access rules.
+
+Windows Authenticode remains separate and uses `WIN_CSC_LINK` / `WIN_CSC_KEY_PASSWORD`; Windows builds without them are unsigned.
+
 ## Contributors
 
 - [@lidge-jun](https://github.com/lidge-jun) — maintainer

package/bin/commands/edit.js

@@ -16,6 +16,7 @@ const KNOWN_IMAGE_MODELS = deriveCliImageModelSet();
 const SPEC = {
     flags: {
         prompt: { short: "p", type: "string" },
+        "image-tool-model": { type: "string" },
         quality: { short: "q", type: "string", default: "low" },
         size: { short: "s", type: "string", default: "1024x1024" },
         out: { short: "o", type: "string" },
@@ -40,12 +41,13 @@ const HELP = `
 
   Options:
     -p, --prompt <text>        Edit instruction (required)
-    -q, --quality <low|medium|high>
+    -q, --quality <low|medium|high|xhigh|max>
     -s, --size <WxH>
     -o, --out <file>
         --json
         --model <${[...KNOWN_IMAGE_MODELS].join("|")}>  Default: gpt-5.6-luna
-                                      Aliases: luna, sol, terra, spark
+                                      Aliases: luna, astra, sol, terra, spark
+        --image-tool-model <id>       API only: gpt-image-2.5-sunburst|gpt-image-2.5-flare
         --provider <${PROVIDER_VALUES.join("|")}>
                                       Provider (oauth = GPT OAuth; grok = xAI Grok; agy/gemini-api = Gemini)
         --mode <auto|direct>       Prompt handling mode. Default: auto
@@ -122,6 +124,8 @@ export default async function editCmd(argv) {
             sessionId: args.session,
             requestId,
         };
+        if (args["image-tool-model"])
+            editBody.imageToolModel = args["image-tool-model"];
         if (args["reasoning-effort"])
             editBody.reasoningEffort = args["reasoning-effort"];
         if (args.provider)

package/bin/commands/gen.js

@@ -30,6 +30,7 @@ const PROVIDER_VALUES = [
 ];
 const SPEC = {
     flags: {
+        "image-tool-model": { type: "string" },
         quality: { short: "q", type: "string", default: "low" },
         size: { short: "s", type: "string", default: "1024x1024" },
         "no-size-nudge": { type: "boolean" },
@@ -59,7 +60,7 @@ const HELP = `
     'ima2 cancel <requestId>'. MCP lanes support -n 1 only.
 
   Options:
-    -q, --quality <low|medium|high>         Core lanes only. Default: low
+    -q, --quality <low|medium|high|xhigh|max>         Core lanes only. Default: low
     -s, --size <WxH | auto>                 Core lanes only. Default: 1024x1024
         --no-size-nudge                     Do not restate --size in the prompt
     -n, --count <1..${MAX_GENERATION_COUNT}>                     MCP lanes: 1 only
@@ -73,7 +74,8 @@ const HELP = `
         --timeout <sec>                     Default: 180
         --server <url>                      Override server URL
         --model <model|lane/model>          Bare IDs must be unique across lanes
-                                            Core aliases: luna, sol, terra, spark
+                                            Core aliases: luna, astra, sol, terra, spark
+        --image-tool-model <id>             API only: gpt-image-2.5-sunburst|gpt-image-2.5-flare
         --provider <${PROVIDER_VALUES.join("|")}>
                                             'auto' was removed; choose a lane explicitly
         --mode <auto|direct>                Core lanes only. Default: auto
@@ -180,6 +182,7 @@ function generatedFilename(value) {
 }
 function rejectUnsupportedMcpFlags(argv, args) {
     const forbidden = [
+        ["--image-tool-model", ["--image-tool-model"]],
         ["--quality", ["--quality", "-q"]], ["--size", ["--size", "-s"]],
         ["--no-save", ["--no-save"]], ["--force", ["--force"]], ["--stdin", ["--stdin"]],
         ["--mode", ["--mode"]], ["--moderation", ["--moderation"]], ["--bg", ["--bg"]],
@@ -299,6 +302,8 @@ async function requestCoreImage(args, context, n, requestId) {
     body.requestId = requestId;
     if (args.bg)
         body.backgroundPreset = String(args.bg);
+    if (args["image-tool-model"])
+        body.imageToolModel = args["image-tool-model"];
     if (args["reasoning-effort"])
         body.reasoningEffort = args["reasoning-effort"];
     if (args["no-web-search"])

package/bin/commands/multimode.js

@@ -15,6 +15,7 @@ const PROVIDER_VALUES = ["auto", ...deriveProviderIds()];
 const KNOWN_IMAGE_MODELS = deriveCliImageModelSet();
 const SPEC = {
     flags: {
+        "image-tool-model": { type: "string" },
         quality: { short: "q", type: "string", default: "low" },
         size: { short: "s", type: "string", default: "1024x1024" },
         "max-images": { type: "string" },
@@ -44,7 +45,7 @@ const HELP = `
   Stream multi-image generation via SSE (phase / partial / image / done / error).
 
   Options:
-    -q, --quality <low|medium|high>     Default: low
+    -q, --quality <low|medium|high|xhigh|max>     Default: low
     -s, --size <WxH>                    Default: 1024x1024
     -n, --count <1..${MAX_GENERATION_COUNT}>                 Default: 4
         --max-images <1..${MAX_GENERATION_COUNT}>            Alias for --count
@@ -52,7 +53,8 @@ const HELP = `
     -d, --out-dir <dir>                 Output dir for multiple images
         --json
         --model <${[...KNOWN_IMAGE_MODELS].join("|")}>  Default: gpt-5.6-luna
-                                      Aliases: luna, sol, terra, spark
+                                      Aliases: luna, astra, sol, terra, spark
+        --image-tool-model <id>       API only: gpt-image-2.5-sunburst|gpt-image-2.5-flare
         --provider <${PROVIDER_VALUES.join("|")}>
                                       Provider (oauth = GPT OAuth; grok = xAI Grok; agy/gemini-api = Gemini)
         --mode <auto|direct>            Prompt handling mode. Default: auto
@@ -128,6 +130,8 @@ export default async function multimodeCmd(argv) {
         body.model = model;
     if (args.provider)
         body.provider = args.provider;
+    if (args["image-tool-model"])
+        body.imageToolModel = args["image-tool-model"];
     if (args["reasoning-effort"])
         body.reasoningEffort = args["reasoning-effort"];
     if (args["no-web-search"])

package/bin/commands/node.js

@@ -17,10 +17,13 @@ const HELP = `
     show <nodeId> [--json]
 
   Generate options:
+    --image-tool-model <id> API only: gpt-image-2.5-sunburst|gpt-image-2.5-flare
+    --quality <low|medium|high|xhigh|max> Extended quality requires an API 2.5 model
     --provider <${PROVIDER_VALUES.join("|")}>  Provider for this request
 ${NAI_CLI_HELP}
 `;
 const GEN_FLAGS = {
+    "image-tool-model": { type: "string" },
     quality: { short: "q", type: "string", default: "low" },
     size: { short: "s", type: "string", default: "1024x1024" },
     count: { short: "n", type: "string", default: "1" },
@@ -96,6 +99,8 @@ async function generateSub(argv) {
         body.provider = args.provider;
     if (args.parent)
         body.parentNodeId = args.parent;
+    if (args["image-tool-model"])
+        body.imageToolModel = args["image-tool-model"];
     if (args["reasoning-effort"])
         body.reasoningEffort = args["reasoning-effort"];
     if (args["no-web-search"])

package/bin/lib/error-hints.js

@@ -2,7 +2,7 @@ const HINTS = {
     SERVER_UNREACHABLE: "Start `ima2 serve`, or pass `--server <url>`.",
     APIKEY_DISABLED: "API-key generation is supported in current builds; switch providers or update the configured API key.",
     IMAGE_MODEL_UNSUPPORTED: "This model is visible but cannot generate images here. Use gpt-5.4 or gpt-5.4-mini.",
-    INVALID_IMAGE_MODEL: "Use one of: gpt-5.5, gpt-5.4, gpt-5.4-mini, gpt-5.6-sol, gpt-5.6-terra, gpt-5.6-luna.",
+    INVALID_IMAGE_MODEL: "Use one of: gpt-5.5, gpt-5.4, gpt-5.4-mini, gpt-5.6-sol, gpt-5.6-terra, gpt-5.6-luna, gpt-6-astra.",
     OAUTH_UNAVAILABLE: "GPT OAuth proxy is unavailable. Check `ima2 doctor` and restart `ima2 serve`.",
     NETWORK_FAILED: "Network/proxy failed. This is not a moderation refusal.",
     SAFETY_REFUSAL: "The image backend refused this generation.",

package/bin/lib/model-aliases.js

@@ -1,5 +1,6 @@
 export const IMAGE_MODEL_ALIASES = {
     luna: "gpt-5.6-luna",
+    astra: "gpt-6-astra",
     sol: "gpt-5.6-sol",
     terra: "gpt-5.6-terra",
     spark: "gpt-5.3-codex-spark",

package/docs/API.md

@@ -327,6 +327,19 @@ Text-to-image and reference-guided root generation.
 
 Supported quality values: `low`, `medium`, `high`.
 
+For `provider: "api"`, generation, edit, multimode, and node generation also accept
+optional `imageToolModel`: `gpt-image-2.5-sunburst` or `gpt-image-2.5-flare`. It selects
+`tools[].model` for the Responses image-generation tool; `model` still selects the
+outer GPT reasoning model. Omit the field (or send null/empty) for upstream selection
+and the existing defaults. Other providers ignore it. Unknown API values return
+`INVALID_IMAGE_TOOL_MODEL` (400, or the existing synchronous multimode SSE error).
+Only an explicit API 2.5 selection enables quality `xhigh` and `max`; elsewhere those
+values normalize to `medium` with `QUALITY_DEFAULTED`. Sidecars, history, generation
+results and existing XMP embedding paths retain the selected `imageToolModel`.
+Edit continues to preserve upstream bytes and uses sidecar metadata.
+`GET /api/capabilities` advertises the API-only tool model/quality allowlist separately
+from the outer models in `/api/models`.
+
 Supported moderation values: `auto`, `low`.
 
 When `storyboard` is `true`, the server prepends storyboard keyframe instructions so image

package/docs/CLI.md

@@ -19,6 +19,20 @@ For a quick start, see the [main README](../README.md). For endpoint mapping, se
 | `ima2 reset` | Remove saved config |
 | `ima2 backfill-thumbs` | Generate missing gallery thumbnails for images and videos (offline, no running server needed) |
 
+## API image tool selection
+
+`gen`, `edit`, `multimode`, and `node generate` accept
+`--image-tool-model gpt-image-2.5-sunburst|gpt-image-2.5-flare` with `--provider api`.
+This is separate from `--model`, which continues to choose the outer GPT reasoning
+model. Omission preserves upstream selection and existing defaults. Only an explicit
+API 2.5 selection enables `--quality xhigh|max`; other scopes normalize these values
+to medium. Non-API core providers ignore the tool model; MCP generation rejects the
+core-only flag.
+
+```bash
+ima2 gen "botanical illustration" --provider api --model gpt-5.4 --image-tool-model gpt-image-2.5-sunburst --quality xhigh
+```
+
 ## Common flags
 
 These work on most client commands:

package/docs/FAQ.ko.md

@@ -104,6 +104,7 @@ ima2 serve
 앱은 `gpt-5.6-luna`로 시작합니다. 계정 지원 범위나 호환성 때문에 필요할 때만 다른 모델을 고르세요.
 
 - `gpt-5.6-luna`: 현재 앱 기본값입니다.
+- `gpt-6-astra`: 가장 최신 GPT 이미지 모델입니다. 선택 가능하지만 기본값은 아닙니다.
 - `gpt-5.6-terra` / `gpt-5.6-sol`: 계정에서 지원할 때 고를 수 있는 GPT-5.6 대안입니다.
 - `gpt-5.5` / `gpt-5.4` / `gpt-5.4-mini`: 호환 선택지로 유지합니다.
 

package/docs/FAQ.md

@@ -137,6 +137,7 @@ Use the **Switch Account** button in Settings > QuotaCard for the provider. This
 The app starts with `gpt-5.6-luna`; choose another model only when you need an explicit compatibility or account-specific override.
 
 - `gpt-5.6-luna`: current app default.
+- `gpt-6-astra`: newest GPT image model; selectable, not the default.
 - `gpt-5.6-sol` / `gpt-5.6-terra`: current GPT-5.6 alternatives;
   availability depends on your OAuth account access, so upstream may reject them
   until the rollout reaches you.

package/docs/FAQ.zh-CN.md

@@ -124,6 +124,7 @@ ima2 serve
 该应用程序开始于`gpt-5.6-luna`;仅当您需要显式兼容性或特定于帐户的覆盖时才选择其他模型。
 
 - `gpt-5.6-luna`：当前应用程序默认值。
+- `gpt-6-astra`：最新的 GPT 图像模型；可选，但不是默认值。
 - `gpt-5.6-sol` / `gpt-5.6-terra`： 当前的GPT-5.6替代方案；
 可用性取决于您的OAuth帐户访问，因此上游可能会拒绝它们
 直到您收到推送通知。

package/docs/FAQ.zh-TW.md

@@ -124,6 +124,7 @@ ima2 serve
 該應用程式開始於`gpt-5.6-luna`;僅當您需要明確相容性或特定於帳戶的覆蓋時才選擇其他模型。
 
 - `gpt-5.6-luna`：當前應用程式預設值。
+- `gpt-6-astra`：最新的 GPT 影像模型；可選，但不是預設值。
 - `gpt-5.6-sol` / `gpt-5.6-terra`： 當前的GPT-5.6替代方案；
 可用性取決於您的OAuth帳戶訪問，因此上游可能會拒絕它們
 直到您收到推播通知。

package/docs/README.ja.md

@@ -131,6 +131,7 @@ Grok 動画の既定値は正式名 `grok-imagine-video-1.5` です。`grok-imag
 画像生成と Prompt Builder の既定値は **`gpt-5.6-luna`** です。旧モデルは互換オプションとして残ります。
 
 - `gpt-5.6-luna` — 現在の画像・Prompt Builder 既定値。
+- `gpt-6-astra` — 最新の GPT 画像モデル。選択できますが既定値ではありません。
 - `gpt-5.6-terra` / `gpt-5.6-sol` — アカウントで利用できる GPT-5.6 オプション。
 - `gpt-5.5` / `gpt-5.4` / `gpt-5.4-mini` — 互換オプション。
 

package/docs/README.ko.md

@@ -150,6 +150,7 @@ Grok video 기본값은 정식 `grok-imagine-video-1.5`입니다. `grok-imagine-
 이미지 생성과 Prompt Builder의 앱 기본값은 **`gpt-5.6-luna`**입니다. 이전 모델은 호환 선택지로 남아 있습니다.
 
 - `gpt-5.6-luna` — 현재 이미지·Prompt Builder 기본값.
+- `gpt-6-astra` — 가장 최신 GPT 이미지 모델. 선택 가능하지만 기본값은 아닙니다.
 - `gpt-5.6-terra` / `gpt-5.6-sol` — 계정에서 지원할 때 고를 수 있는 GPT-5.6 대안.
 - `gpt-5.5`, `gpt-5.4`, `gpt-5.4-mini` — 호환 선택지.
 

package/docs/README.zh-CN.md

@@ -187,6 +187,7 @@ Grok视频生成默认为规范`grok-imagine-video-1.5`; `grok-imagine-video`仍
 该应用程序默认为**`gpt-5.6-luna`**用于图像生成和 Prompt Builder 规划。较旧的受支持型号仍保留明确的兼容性选择。
 
 - `gpt-5.6-luna`— 当前图像和提示生成器默认值。
+- `gpt-6-astra`— 最新的 GPT 图像模型；可选，但不是默认值。
 - `gpt-5.6-terra` / `gpt-5.6-sol`- 当前的GPT-5.6当您的帐户暴露它们时的替代方案。
 - `gpt-5.5`, `gpt-5.4`, `gpt-5.4-mini`- 支持的兼容性选择。
 

package/docs/README.zh-TW.md

@@ -181,6 +181,7 @@ Grok影片產生預設為規範`grok-imagine-video-1.5`; `grok-imagine-video`仍
 該應用程式預設為**`gpt-5.6-luna`**用於影像生成和 Prompt Builder 規劃。較舊的受支援型號仍保留明確的兼容性選擇。
 
 - `gpt-5.6-luna`— 目前影像和提示產生器預設值。
+- `gpt-6-astra`— 最新的 GPT 影像模型；可選，但不是預設值。
 - `gpt-5.6-terra` / `gpt-5.6-sol`- 目前的GPT-5.6當您的帳戶暴露它們時的替代方案。
 - `gpt-5.5`, `gpt-5.4`, `gpt-5.4-mini`- 支援的相容性選擇。
 

package/docs/migration/runtime-test-inventory.md

@@ -4,7 +4,7 @@ Generated by `npm run test:inventory` (script: `scripts/classify-tests.mjs`).
 
 _Tests considered "runtime-importing" if they import from `../lib/`, `../routes/`, `../bin/`, `../server`, or `../config`._
 
-Total: 490 (runtime: 225, contract: 265)
+Total: 499 (runtime: 226, contract: 273)
 
 ## Runtime-importing tests
 - `tests/advertise-payload-contract.test.ts`
@@ -26,6 +26,7 @@ Total: 490 (runtime: 225, contract: 265)
 - `tests/agy-execution-cleanup.test.ts`
 - `tests/agy-execution-process.test.ts`
 - `tests/api-cache-policy.test.ts`
+- `tests/api-image-tool-model.test.ts`
 - `tests/api-provider-parity.test.ts`
 - `tests/api-request-budget.test.ts`
 - `tests/asset-character-bindings.test.ts`
@@ -331,6 +332,14 @@ Total: 490 (runtime: 225, contract: 265)
 - `tests/core-selection-reconcile.test.ts`
 - `tests/core-selection-transport.test.mjs`
 - `tests/current-image-actions-readiness-contract.test.js`
+- `tests/desktop-app-lifecycle.test.ts`
+- `tests/desktop-mac-verification.test.ts`
+- `tests/desktop-release-assets.test.ts`
+- `tests/desktop-release-contract.test.ts`
+- `tests/desktop-release-workflow-shell.test.ts`
+- `tests/desktop-sign-extra.test.ts`
+- `tests/desktop-signing-policy.test.ts`
+- `tests/desktop-updater.test.ts`
 - `tests/direct-mode-visual-contract.test.js`
 - `tests/dropped-media-sorting-contract.test.ts`
 - `tests/duration-slider-contract.test.js`

package/integrations/comfyui/ima2_gen_bridge/nodes.py

@@ -17,7 +17,7 @@ from PIL import Image
 DEFAULT_SERVER_URL = "http://127.0.0.1:3333"
 IMA2_CLIENT_HEADER = "comfyui/bridge"
 ALLOWED_LOOPBACK_HOSTS = {"127.0.0.1", "localhost", "::1"}
-MODEL_OPTIONS = ["", "gpt-5.6-luna", "gpt-5.6-terra", "gpt-5.6-sol", "gpt-5.5", "gpt-5.4", "gpt-5.4-mini"]
+MODEL_OPTIONS = ["", "gpt-5.6-luna", "gpt-6-astra", "gpt-5.6-terra", "gpt-5.6-sol", "gpt-5.5", "gpt-5.4", "gpt-5.4-mini"]
 
 
 class Ima2BridgeError(Exception):

package/lib/capabilities.js

@@ -4,7 +4,7 @@ import { AGENT_TOOL_MANIFEST } from "./agentToolManifest.js";
 import { buildCatalog, catalogSummary } from "./contracts/catalog.js";
 import { loadAllBundledSnapshots } from "./mcp/snapshotStore.js";
 import { KEY_TO_ENV, WRITABLE_CONFIG_KEYS } from "./configKeys.js";
-import { DEFAULT_IMAGE_QUALITY, VALID_IMAGE_QUALITIES } from "./oauthNormalize.js";
+import { DEFAULT_IMAGE_QUALITY, VALID_IMAGE_QUALITIES, API_IMAGE_TOOL_MODELS, API_IMAGE_25_QUALITIES } from "./oauthNormalize.js";
 import { MAX_REF2V_DURATION_15, MAX_REF2V_DURATION_BASE, MAX_REF2V_REFERENCES, MAX_REFERENCE_AUDIOS, MAX_VIDEO_DURATION, MIN_VIDEO_DURATION, } from "./imageModels.js";
 import { deriveProviderIds, getProviderSurfaceSupport } from "./providers/derive.js";
 import { PROVIDER_SURFACES } from "./providers/surfaceSupport.js";
@@ -75,6 +75,7 @@ export function buildIma2Capabilities({ appConfig = runtimeConfigDefault, packag
             },
         },
         valid: {
+            imageToolModels: { api: [...API_IMAGE_TOOL_MODELS], qualities: [...API_IMAGE_25_QUALITIES] },
             imageModels: {
                 supported: toArray(appConfig.imageModels.valid),
                 unsupported: toArray(appConfig.imageModels.unsupported),

package/lib/generatePipeline.js

@@ -117,7 +117,7 @@ export async function runGeneratePipeline(req, res, ctx) {
         }
         const sessionId = typeof req.body?.sessionId === "string" ? req.body.sessionId : null;
         const clientNodeId = typeof req.body?.clientNodeId === "string" ? req.body.clientNodeId : null;
-        const { prompt, quality: rawQuality = "medium", size = "1024x1024", format = "png", moderation = "low", provider = "auto", n = 1, references = [], mode: promptMode = "auto", model: rawModel, reasoningEffort: rawReasoningEffort, webSearchEnabled: rawWebSearchEnabled = true, } = req.body;
+        const { prompt, quality: rawQuality = "medium", size = "1024x1024", format = "png", moderation = "low", provider = "auto", n = 1, references = [], mode: promptMode = "auto", model: rawModel, imageToolModel: rawImageToolModel, reasoningEffort: rawReasoningEffort, webSearchEnabled: rawWebSearchEnabled = true, } = req.body;
         const promptError = validateGenerationPrompt(prompt);
         if (promptError)
             return fail(400, promptError);
@@ -144,10 +144,11 @@ export async function runGeneratePipeline(req, res, ctx) {
         // forced value; the OAuth proxy does not (see lib/imageBackgroundParam.ts).
         const composerPrompt = normalizeComposerPrompt(req.body?.composerPrompt);
         const composerInsertedPrompts = normalizeComposerInsertedPrompts(req.body?.composerInsertedPrompts);
-        const { quality, warnings: qualityWarnings } = normalizeOAuthParams({ provider, quality: rawQuality });
+        const { quality, warnings: qualityWarnings } = normalizeOAuthParams({ provider, quality: rawQuality, imageToolModel: rawImageToolModel });
         const providerOptions = resolveProviderOptions(ctx, {
             provider,
             rawModel,
+            rawImageToolModel,
             rawReasoningEffort,
             rawSize: size,
             rawWebSearchEnabled,
@@ -156,6 +157,7 @@ export async function runGeneratePipeline(req, res, ctx) {
             return fail(providerOptions.status, { error: providerOptions.error, code: providerOptions.code });
         }
         const imageModel = providerOptions.model;
+        const imageToolModel = providerOptions.imageToolModel;
         const reasoningEffort = providerOptions.reasoningEffort;
         const effectiveSize = providerOptions.size;
         const webSearchEnabled = providerOptions.webSearchEnabled;
@@ -317,6 +319,7 @@ export async function runGeneratePipeline(req, res, ctx) {
                 clientNodeId,
                 quality,
                 model: imageModel,
+                ...(imageToolModel ? { imageToolModel } : {}),
                 size: effectiveSize,
                 n: count,
                 refsCount: providerRefCount,
@@ -356,6 +359,7 @@ export async function runGeneratePipeline(req, res, ctx) {
             provider: activeProvider,
             quality,
             model: imageModel,
+            ...(imageToolModel ? { imageToolModel } : {}),
             size: effectiveSize,
             moderation,
             n: count,
@@ -385,7 +389,7 @@ export async function runGeneratePipeline(req, res, ctx) {
             surface: "classic", provider: activeProvider, requestId,
             signal: cancelController.signal, prompt: generationPrompt, rawPrompt: prompt,
             references: refCheck.refDetails, providerUrl: incomingProviderUrl,
-            options: { model: imageModel, quality, size: effectiveSize, moderation,
+            options: { model: imageModel, imageToolModel, quality, size: effectiveSize, moderation,
                 mode: normalizedPromptMode, reasoningEffort, webSearchEnabled },
             background: backgroundParams,
             backgroundConstraint: backgroundPreset ? backgroundPlannerConstraint(backgroundPreset) : undefined,
@@ -514,6 +518,7 @@ export async function runGeneratePipeline(req, res, ctx) {
                     format: resultFormat,
                     moderation,
                     model: activeProvider === "grok" ? resolveGrokQualityModel(imageModel, quality) : imageModel,
+                    ...(imageToolModel ? { imageToolModel } : {}),
                     reasoningEffort,
                     provider: activeProvider,
                     createdAt,
@@ -617,6 +622,7 @@ export async function runGeneratePipeline(req, res, ctx) {
             size: effectiveSize,
             moderation,
             model: imageModel,
+            ...(imageToolModel ? { imageToolModel } : {}),
             warnings: qualityWarnings,
             revisedPrompt: firstRevised,
             promptMode: normalizedPromptMode,

package/lib/historyList.js

@@ -64,6 +64,7 @@ export async function listHistoryRows(baseDir = config.storage.generatedDir) {
             size: meta?.size || null,
             format: meta?.format || name.split(".").pop(),
             model: meta?.model || null,
+            ...(meta?.provider === "api" && meta?.imageToolModel ? { imageToolModel: meta.imageToolModel } : {}),
             reasoningEffort: meta?.reasoningEffort ?? null,
             elapsed: meta?.elapsed ?? null,
             provider: meta?.provider || "oauth",

package/lib/imageMetadata.js

@@ -55,6 +55,7 @@ export function buildIma2MetadataPayload(meta = {}, context = {}) {
         format: stringOrNull(meta.format, 20),
         moderation: stringOrNull(meta.moderation, 40),
         model: stringOrNull(meta.model, 80),
+        ...(meta.provider === "api" && meta.imageToolModel ? { imageToolModel: stringOrNull(meta.imageToolModel, 80) } : {}),
         reasoningEffort: stringOrNull(meta.reasoningEffort, 40),
         elapsed: numberOrNull(meta.elapsed),
         provider: stringOrNull(meta.provider, 40),

package/lib/imageModels.js

@@ -5,6 +5,23 @@ const UNSUPPORTED_IMAGE_MODELS = deriveUnsupportedImageModels();
 const FALLBACK_REASONING_EFFORT = "none";
 const VALID_REASONING_EFFORTS = new Set(["none", "low", "medium", "high", "xhigh", "max"]);
 export const GROK_FALLBACK_IMAGE_MODEL = "grok-imagine-image-2.0";
+/**
+ * Models that reject `reasoning.effort: "none"` upstream.
+ *
+ * GPT-6 Astra accepts low/medium/high/xhigh/max but not "none", while this app's
+ * own default effort is "none". Without a coercion here, simply selecting Astra
+ * in the UI would fail the request before an image is ever generated. OpenAI's
+ * migration guidance names "low" as the replacement for "none"/"minimal", so
+ * that is what a "none" request becomes for these models. Every other model is
+ * untouched, and an explicit effort is never downgraded.
+ */
+const MODELS_WITHOUT_NONE_EFFORT = new Set(["gpt-6-astra"]);
+/** Coerce only the unsupported pairing; any other model/effort passes through. */
+export function coerceReasoningEffortForModel(model, effort) {
+    if (effort !== "none" || model === undefined)
+        return effort;
+    return MODELS_WITHOUT_NONE_EFFORT.has(model) ? "low" : effort;
+}
 // xAI's current flagship Imagine image model. The legacy "quality" knob used to
 // swap in grok-imagine-image-quality; 2.0 supersedes it for high-quality work,
 // so the knob now resolves here. An explicit user selection is never downgraded.
@@ -60,7 +77,7 @@ export function normalizeImageModel(ctx, rawModel) {
     }
     if (!valid.has(rawModel)) {
         return {
-            error: "model must be one of: gpt-5.5, gpt-5.4, gpt-5.4-mini, gpt-5.6-sol, gpt-5.6-terra, gpt-5.6-luna",
+            error: "model must be one of: gpt-5.5, gpt-5.4, gpt-5.4-mini, gpt-5.6-sol, gpt-5.6-terra, gpt-5.6-luna, gpt-6-astra",
             code: "INVALID_IMAGE_MODEL",
             status: 400,
         };

package/lib/multimodePipeline.js

@@ -111,6 +111,7 @@ export async function runMultimodePipeline(req, res, ctx) {
     let routeQuality = "medium";
     let routeEffectiveSize = "1024x1024";
     let routeModeration = "low";
+    let routeImageToolModel;
     let routeImageModel = null;
     let routeWebSearchEnabled = true;
     let routePromptMode = "auto";
@@ -127,12 +128,12 @@ export async function runMultimodePipeline(req, res, ctx) {
         res.flushHeaders?.();
     }
     try {
-        const { prompt, quality: rawQuality = "medium", size = "1024x1024", format = "png", moderation = "low", provider = "auto", references = [], mode: promptMode = "auto", model: rawModel, reasoningEffort: rawReasoningEffort, webSearchEnabled: rawWebSearchEnabled = true, } = req.body;
+        const { prompt, quality: rawQuality = "medium", size = "1024x1024", format = "png", moderation = "low", provider = "auto", references = [], mode: promptMode = "auto", model: rawModel, imageToolModel: rawImageToolModel, reasoningEffort: rawReasoningEffort, webSearchEnabled: rawWebSearchEnabled = true, } = req.body;
         const composerPrompt = normalizeComposerPrompt(req.body?.composerPrompt);
         const composerInsertedPrompts = normalizeComposerInsertedPrompts(req.body?.composerInsertedPrompts);
         const maxImages = normalizeMaxImages(maxImagesResult.value, maxAllowedImages);
         const normalizedPromptMode = promptMode === "direct" ? "direct" : "auto";
-        const { quality, warnings: qualityWarnings } = normalizeOAuthParams({ provider, quality: rawQuality });
+        const { quality, warnings: qualityWarnings } = normalizeOAuthParams({ provider, quality: rawQuality, imageToolModel: rawImageToolModel });
         // Multimode has no comfy dispatch in this unit. Without this guard the
         // request would reach generateViaResponses and bill OAuth for an image
         // the user asked ComfyUI to make — silently, with no error to trace.
@@ -151,6 +152,7 @@ export async function runMultimodePipeline(req, res, ctx) {
         const providerOptions = resolveProviderOptions(ctx, {
             provider,
             rawModel,
+            rawImageToolModel,
             rawReasoningEffort,
             rawSize: size,
             rawWebSearchEnabled,
@@ -167,6 +169,7 @@ export async function runMultimodePipeline(req, res, ctx) {
             });
         }
         const imageModel = providerOptions.model;
+        const imageToolModel = providerOptions.imageToolModel;
         const reasoningEffort = providerOptions.reasoningEffort;
         const effectiveSize = providerOptions.size;
         const webSearchEnabled = providerOptions.webSearchEnabled;
@@ -227,6 +230,7 @@ export async function runMultimodePipeline(req, res, ctx) {
                 kind: "multimode",
                 quality,
                 model: imageModel,
+                ...(imageToolModel ? { imageToolModel } : {}),
                 size: effectiveSize,
                 maxImages,
                 refsCount: referencePayload.refsCount,
@@ -270,6 +274,7 @@ export async function runMultimodePipeline(req, res, ctx) {
         routeEffectiveSize = effectiveSize;
         routeModeration = moderation;
         routeImageModel = imageModel ?? null;
+        routeImageToolModel = imageToolModel;
         routeWebSearchEnabled = webSearchEnabled ?? false;
         routePromptMode = normalizedPromptMode;
         routeQualityWarnings = qualityWarnings;
@@ -317,6 +322,7 @@ export async function runMultimodePipeline(req, res, ctx) {
                 format: resultFormat,
                 moderation,
                 model: activeProvider === "grok" ? resolveGrokQualityModel(imageModel, quality) : imageModel,
+                ...(imageToolModel ? { imageToolModel } : {}),
                 provider: activeProvider,
                 createdAt,
                 usage: latestUsage,
@@ -357,7 +363,7 @@ export async function runMultimodePipeline(req, res, ctx) {
             surface: "multimode", provider: activeProvider, requestId,
             signal: cancelController.signal, prompt: generationPrompt, rawPrompt: prompt,
             references: refCheck.refDetails, providerUrl: incomingProviderUrl, maxImages,
-            options: { model: imageModel, quality, size: effectiveSize, moderation,
+            options: { model: imageModel, imageToolModel, quality, size: effectiveSize, moderation,
                 mode: normalizedPromptMode, reasoningEffort, webSearchEnabled },
             nai: activeProvider === "nai" ? readNaiOptions(req.body) : {},
         }, {
@@ -419,6 +425,7 @@ export async function runMultimodePipeline(req, res, ctx) {
             size: effectiveSize,
             moderation,
             model: imageModel,
+            ...(imageToolModel ? { imageToolModel } : {}),
             usage: latestUsage,
             webSearchCalls: latestWebSearchCalls,
             webSearchEnabled,
@@ -470,6 +477,7 @@ export async function runMultimodePipeline(req, res, ctx) {
                 size: routeEffectiveSize,
                 moderation: routeModeration,
                 model: routeImageModel,
+                ...(routeImageToolModel ? { imageToolModel: routeImageToolModel } : {}),
                 usage: latestUsage,
                 webSearchCalls: latestWebSearchCalls,
                 webSearchEnabled: routeWebSearchEnabled,