Merge branch 'main' of https://huggingface.co/spaces/Logankunfall/chutes into pr/1

data/models.json

@@ -1,29 +1,26 @@
 [
-  { "id": "JuggernautXL", "name": "JuggernautXL", "free": true },
   { "id": "qwen-image", "name": "qwen-image", "free": false },
-  { "id": "hidream", "name": "hidream", "free": false },
-  { "id": "FLUX.1-dev", "name": "FLUX.1-dev", "free": false },
-  { "id": "FLUX.1-schnell", "name": "FLUX.1-schnell", "free": false },
-  { "id": "chroma", "name": "chroma", "free": true },
-  { "id": "neta-lumina", "name": "neta-lumina", "free": true },
-  { "id": "nova-anime3d-xl", "name": "nova-anime3d-xl", "free": false },
-  { "id": "Illustrij", "name": "Illustrij", "free": false },
-  { "id": "stabilityai/stable-diffusion-xl-base-1.0", "name": "stable-diffusion-xl-base-1.0", "free": false },
-  { "id": "iLustMix", "name": "iLustMix", "free": false },
-  { "id": "Animij", "name": "Animij", "free": false },
-  { "id": "NovaFurryXL", "name": "NovaFurryXL", "free": false },
-  { "id": "Lykon/dreamshaper-xl-1-0", "name": "dreamshaper-xl-1-0", "free": false },
-  { "id": "Shitao/OmniGen-v1", "name": "OmniGen-v1", "free": false },
-  { "id": "diagonalge/Booba", "name": "Booba", "free": false },
-  { "id": "HassakuXL", "name": "HassakuXL", "free": false },
-  { "id": "nova-cartoon-xl", "name": "nova-cartoon-xl", "free": false },
-  { "id": "orphic-lora", "name": "orphic-lora", "free": false },
-  { "id": "diagonalge/ConstShaper", "name": "ConstShaper", "free": false },
+  { "id": "qwen-image-edit", "name": "qwen-image-edit", "free": false, "upstream_id": "qwen-image", "upstream_url": "https://chutes-qwen-image-edit-2509.chutes.ai/generate" },
   {
     "id": "hunyuan-image-3",
     "name": "hunyuan-image-3",
     "free": false,
     "minimal": true,
     "upstream_url": "https://chutes-hunyuan-image-3.chutes.ai/generate"
+  },
+  { "id": "novafurry/NovaFurryXL", "name": "NovaFurryXL", "free": false },
+  { "id": "hidream", "name": "hidream", "free": false, "upstream_url": "https://chutes-hidream.chutes.ai/generate" },
+  {
+    "id": "z-image-turbo",
+    "name": "Z-Image-Turbo",
+    "free": false,
+    "minimal": true,
+    "upstream_url": "https://chutes-z-image-turbo.chutes.ai/generate",
+    "default_params": {
+      "guidance_scale": 0.0,
+      "num_inference_steps": 9,
+      "shift": 3.0,
+      "max_sequence_length": 512
+    }
   }
 ]

public/index.html

@@ -341,7 +341,14 @@
       width: 100%;
       height: auto;
       display: block;
-      object-fit: contain;
+      aspect-ratio: 1;
+      object-fit: cover;
+      cursor: pointer;
+      transition: opacity 0.2s ease;
+    }
+    
+    .card img:hover {
+      opacity: 0.9;
     }
     
     .card .meta {
@@ -627,58 +634,119 @@
         width: 100%;
       }
     }
-
-  /* Image Viewer (Lightbox) */
-  .image-viewer-overlay {
-    position: fixed;
-    inset: 0;
-    background: rgba(0, 0, 0, 0.7);
-    display: none;
-    align-items: center;
-    justify-content: center;
-    z-index: 1000;
-  }
-  .image-viewer-overlay.show { display: flex; }
-  .image-viewer-content {
-    position: relative;
-    max-width: 90vw;
-    max-height: 90vh;
-  }
-  .image-viewer-content img {
-    max-width: 90vw;
-    max-height: 90vh;
-    width: auto;
-    height: auto;
-    object-fit: contain;
-    box-shadow: var(--shadow-lg);
-    border-radius: 8px;
-  }
-  .image-viewer-close {
-    position: absolute;
-    right: 8px;
-    top: 8px;
-    background: var(--bg);
-    color: var(--fg);
-    border: 1px solid var(--border);
-    border-radius: 6px;
-    padding: 6px 10px;
-    cursor: pointer;
-    min-height: auto;
-  }
+    
+    /* SVG图标样式 */
+    .icon-sparkles {
+      width: 24px;
+      height: 24px;
+      fill: currentColor;
+    }
+    
+    /* 大图预览模态框样式 */
+    .image-modal {
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      background: rgba(0, 0, 0, 0.9);
+      z-index: 9999;
+      display: none;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      padding: 20px;
+    }
+    
+    .image-modal.show {
+      display: flex;
+    }
+    
+    .image-modal-close {
+      position: absolute;
+      top: 20px;
+      right: 20px;
+      background: rgba(255, 255, 255, 0.2);
+      border: none;
+      color: white;
+      font-size: 32px;
+      cursor: pointer;
+      width: 48px;
+      height: 48px;
+      border-radius: 50%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: all 0.2s ease;
+      z-index: 10001;
+      min-height: auto;
+      padding: 0;
+    }
+    
+    .image-modal-close:hover {
+      background: rgba(255, 255, 255, 0.3);
+      transform: scale(1.1);
+    }
+    
+    .image-modal-content {
+      max-width: 90%;
+      max-height: 85%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    
+    .image-modal-content img {
+      max-width: 100%;
+      max-height: 100%;
+      object-fit: contain;
+      border-radius: 8px;
+      box-shadow: 0 10px 40px rgba(0, 0, 0, 0.5);
+    }
+    
+    .image-modal-info {
+      color: white;
+      margin-top: 16px;
+      font-size: 14px;
+      text-align: center;
+      background: rgba(0, 0, 0, 0.5);
+      padding: 8px 16px;
+      border-radius: 4px;
+    }
   </style>
 </head>
 <body>
+<!-- SVG图标定义 -->
+<svg style="display: none;">
+  <defs>
+    <symbol id="icon-sparkles" viewBox="0 0 24 24">
+      <path d="M12 0L14.59 8.41L23 11L14.59 13.59L12 22L9.41 13.59L1 11L9.41 8.41L12 0Z"/>
+      <path d="M19 8L20.5 12.5L25 14L20.5 15.5L19 20L17.5 15.5L13 14L17.5 12.5L19 8Z" opacity="0.6"/>
+    </symbol>
+    <symbol id="icon-bell" viewBox="0 0 24 24">
+      <path d="M12 2C11.172 2 10.5 2.672 10.5 3.5V4.191C8.211 4.886 6.5 7.039 6.5 9.6V14L4.5 16V17H19.5V16L17.5 14V9.6C17.5 7.039 15.789 4.886 13.5 4.191V3.5C13.5 2.672 12.828 2 12 2ZM10 18C10 19.1 10.9 20 12 20C13.1 20 14 19.1 14 18H10Z"/>
+    </symbol>
+    <symbol id="icon-bell-off" viewBox="0 0 24 24">
+      <path d="M12 2C11.172 2 10.5 2.672 10.5 3.5V4.191C8.211 4.886 6.5 7.039 6.5 9.6V14L4.5 16V17H19.5V16L17.5 14V9.6C17.5 7.039 15.789 4.886 13.5 4.191V3.5C13.5 2.672 12.828 2 12 2ZM10 18C10 19.1 10.9 20 12 20C13.1 20 14 19.1 14 18H10Z" opacity="0.3"/>
+      <path d="M2 2L22 22" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+    </symbol>
+  </defs>
+</svg>
 <header>
   <button class="mobile-menu-toggle" id="mobileMenuToggle">☰</button>
   <h1>Chutes</h1>
   <div class="controls">
     <div class="toggle-group">
-      <button id="soundToggle" class="toggle-btn">提示音</button>
+      <button id="soundToggle" class="toggle-btn">
+        <svg width="16" height="16">
+          <use href="#icon-bell"></use>
+        </svg>
+      </button>
       <button id="themeToggle" class="toggle-btn">主题</button>
     </div>
     <div class="api-input">
-      <span>Key</span>
-      <input type="password" id="apiKeyInput" placeholder="API Token">
+      <span>密钥</span>
+      <input type="password" id="apiKeyInput" placeholder="API 密钥">
     </div>
   </div>
 </header>
@@ -693,13 +761,18 @@
   <div class="sidebar-content">
     <div class="group">
       <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 8px;">
-        <button id="soundToggleMobile" class="toggle-btn">提示音</button>
+        <button id="soundToggleMobile" class="toggle-btn">
+          <svg width="16" height="16" style="margin-right: 4px;">
+            <use href="#icon-bell"></use>
+          </svg>
+          <span>提示音</span>
+        </button>
         <button id="themeToggleMobile" class="toggle-btn">主题</button>
       </div>
     </div>
     <div class="group">
-      <label>API Key</label>
-      <input type="password" id="apiKeyInputMobile" placeholder="粘贴 Token" style="width: 100%; padding: 10px 12px; border: 1px solid var(--border); border-radius: 6px; background: var(--bg); color: var(--fg); font-size: 14px;">
+      <label>API 密钥</label>
+      <input type="password" id="apiKeyInputMobile" placeholder="粘贴密钥" style="width: 100%; padding: 10px 12px; border: 1px solid var(--border); border-radius: 6px; background: var(--bg); color: var(--fg); font-size: 14px;">
     </div>
     <div class="group">
       <label>模型</label>
@@ -709,16 +782,47 @@
       <label>提示词</label>
       <textarea id="promptMobile" rows="3" placeholder="例如：原神角色 插画风，清晰细节，高质量"></textarea>
     </div>
+    <div class="group" id="groupImagesMobile">
+      <label>参考图（最多3张，仅用于 qwen-image-edit）</label>
+      <input type="file" id="imagesMobile" accept="image/*" multiple>
+      <div class="status" id="imagesStatusMobile">未选择</div>
+    </div>
+    <div class="group" id="groupTrueCfgMobile">
+      <label>True CFG 系数（qwen-image-edit）</label>
+      <input type="number" id="true_cfg_scaleMobile" step="0.1" min="0" max="10" value="4">
+    </div>
     <div class="group">
       <label>反向提示词</label>
       <textarea id="negative_promptMobile" rows="2" placeholder="blurry, lowres, bad anatomy, artifacts"></textarea>
     </div>
-    <div class="group form-grid">
+    <div class="group" id="groupResolutionMobile" style="display: none;">
+      <label>分辨率（仅 hidream）</label>
+      <select id="resolutionMobile">
+        <option value="1024x1024">1024x1024</option>
+        <option value="768x1360">768x1360</option>
+        <option value="1360x768">1360x768</option>
+        <option value="880x1168">880x1168</option>
+        <option value="1168x880">1168x880</option>
+        <option value="1248x832">1248x832</option>
+        <option value="832x1248">832x1248</option>
+      </select>
+    </div>
+    <div class="group form-grid" id="groupZImageParamsMobile" style="display: none;">
+      <div class="group">
+        <label>Shift（Z-Image-Turbo）</label>
+        <input type="number" id="shiftMobile" step="0.1" min="1" max="10" value="3.0">
+      </div>
       <div class="group">
+        <label>Max Sequence Length</label>
+        <input type="number" id="max_sequence_lengthMobile" step="1" min="256" max="2048" value="512">
+      </div>
+    </div>
+    <div class="group form-grid">
+      <div class="group" id="groupWidthMobile">
         <label>宽度</label>
         <input type="number" id="widthMobile" value="1024">
       </div>
-      <div class="group">
+      <div class="group" id="groupHeightMobile">
         <label>高度</label>
         <input type="number" id="heightMobile" value="1024">
       </div>
@@ -750,7 +854,11 @@
 </div>
 
 <!-- Mobile Generate Button -->
-<button class="mobile-generate-btn" id="mobileGenerateBtn">✨</button>
+<button class="mobile-generate-btn" id="mobileGenerateBtn">
+  <svg class="icon-sparkles">
+    <use href="#icon-sparkles"></use>
+  </svg>
+</button>
 
 <main>
   <section class="panel" id="desktopPanel">
@@ -765,16 +873,47 @@
       <label>提示词</label>
       <textarea id="prompt" rows="2" placeholder="例如：原神角色 插画风，清晰细节，高质量"></textarea>
     </div>
+    <div class="group" id="groupImages">
+      <label>参考图（最多3张，仅用于 qwen-image-edit）</label>
+      <input type="file" id="images" accept="image/*" multiple>
+      <div class="status" id="imagesStatus">未选择</div>
+    </div>
+    <div class="group" id="groupTrueCfg">
+      <label>True CFG 系数（qwen-image-edit）</label>
+      <input type="number" id="true_cfg_scale" step="0.1" min="0" max="10" value="4">
+    </div>
     <div class="group">
       <label>反向提示词</label>
       <textarea id="negative_prompt" rows="1" placeholder="blurry, lowres, bad anatomy, artifacts"></textarea>
     </div>
-    <div class="group form-grid">
+    <div class="group" id="groupResolution" style="display: none;">
+      <label>分辨率（仅 hidream）</label>
+      <select id="resolution">
+        <option value="1024x1024">1024x1024</option>
+        <option value="768x1360">768x1360</option>
+        <option value="1360x768">1360x768</option>
+        <option value="880x1168">880x1168</option>
+        <option value="1168x880">1168x880</option>
+        <option value="1248x832">1248x832</option>
+        <option value="832x1248">832x1248</option>
+      </select>
+    </div>
+    <div class="group form-grid" id="groupZImageParams" style="display: none;">
+      <div class="group">
+        <label>Shift（Z-Image-Turbo）</label>
+        <input type="number" id="shift" step="0.1" min="1" max="10" value="3.0">
+      </div>
       <div class="group">
+        <label>Max Sequence Length</label>
+        <input type="number" id="max_sequence_length" step="1" min="256" max="2048" value="512">
+      </div>
+    </div>
+    <div class="group form-grid">
+      <div class="group" id="groupWidth">
         <label>宽度</label>
         <input type="number" id="width" value="1024">
       </div>
-      <div class="group">
+      <div class="group" id="groupHeight">
         <label>高度</label>
         <input type="number" id="height" value="1024">
       </div>
@@ -810,6 +949,16 @@
     <div id="gallery" class="gallery"></div>
   </section>
 </main>
+
+<!-- 大图预览模态框 -->
+<div class="image-modal" id="imageModal">
+  <button class="image-modal-close" id="imageModalClose">×</button>
+  <div class="image-modal-content">
+    <img id="imageModalImg" src="" alt="预览">
+  </div>
+  <div class="image-modal-info" id="imageModalInfo"></div>
+</div>
+
 <audio id="notify" src="/studio/new-notification-3-398649.mp3" preload="auto"></audio>
 <script>
   const qs = s => document.querySelector(s);
@@ -821,13 +970,15 @@
 
   const state = {
     models: [],
+    modelsConfig: [], // 存储完整的模型配置（包括 default_params）
     sound: true,
     theme: 'light',
     apiKey: '',
     folderHandle: null,
     seedRandom: true,
     isMobile: window.innerWidth <= 768,
-    sidebarOpen: false
+    sidebarOpen: false,
+    imageB64s: []
   };
 
   function setTheme(t) {
@@ -859,14 +1010,24 @@
     const btn = qs('#soundToggle');
     if (btn) {
       btn.classList.toggle('active', state.sound);
-      btn.textContent = state.sound ? '🔔' : '🔕';
+      const svg = btn.querySelector('svg use');
+      if (svg) {
+        svg.setAttribute('href', state.sound ? '#icon-bell' : '#icon-bell-off');
+      }
     }
     
     // 更新移动端按钮
     const btnMobile = qs('#soundToggleMobile');
     if (btnMobile) {
       btnMobile.classList.toggle('active', state.sound);
-      btnMobile.textContent = state.sound ? '🔔 开启' : '🔕 关闭';
+      const svg = btnMobile.querySelector('svg use');
+      const span = btnMobile.querySelector('span');
+      if (svg) {
+        svg.setAttribute('href', state.sound ? '#icon-bell' : '#icon-bell-off');
+      }
+      if (span) {
+        span.textContent = state.sound ? '开启' : '关闭';
+      }
     }
   }
 
@@ -875,6 +1036,8 @@
     ls.set('apiKey', state.apiKey);
     const el = qs('#apiKeyInput');
     if (el && el.value !== state.apiKey) el.value = state.apiKey;
+    const elMobile = qs('#apiKeyInputMobile');
+    if (elMobile && elMobile.value !== state.apiKey) elMobile.value = state.apiKey;
   }
 
   function updateSeedToggle() {
@@ -898,9 +1061,12 @@
         headers: state.apiKey ? { 'x-api-key': state.apiKey } : {}
       });
       const j = await r.json();
+      // 保存完整的模型配置
+      state.modelsConfig = j.models || [];
       state.models = (j.models || []).map(m => ({
         id: String(m.id || m.name || ''),
-        name: String(m.name || m.id || '')
+        name: String(m.name || m.id || ''),
+        default_params: m.default_params || null
       }));
       renderModels();
     } catch(e) {
@@ -924,21 +1090,103 @@
         if (last && last.model) sel.value = last.model;
       }
     });
+    // 根据当前模型更新参数可见性（桌面与移动端）
+    updateVisibleFieldsFor('');
+    updateVisibleFieldsFor('Mobile');
+  }
+
+  function toggleGroup(selector, show) {
+    const el = qs(selector);
+    if (!el) return;
+    el.style.display = show ? '' : 'none';
+  }
+
+  function updateVisibleFieldsFor(suffix) {
+    const sel = qs(`#modelSelect${suffix}`);
+    if (!sel) return;
+    const model = String(sel.value || '').toLowerCase();
+    const isQwenEdit = model === 'qwen-image-edit';
+    const isHidream = model === 'hidream';
+    const isZImageTurbo = model === 'z-image-turbo';
+
+    toggleGroup(`#groupImages${suffix}`, isQwenEdit);
+    toggleGroup(`#groupTrueCfg${suffix}`, isQwenEdit);
+
+    // hidream 使用分辨率；隐藏宽高，显示分辨率下拉
+    toggleGroup(`#groupWidth${suffix}`, !isHidream);
+    toggleGroup(`#groupHeight${suffix}`, !isHidream);
+    toggleGroup(`#groupResolution${suffix}`, isHidream);
+    
+    // Z-Image-Turbo 显示专用参数
+    toggleGroup(`#groupZImageParams${suffix}`, isZImageTurbo);
+    
+    // 应用模型的默认参数
+    applyModelDefaultParams(model, suffix);
+  }
+  
+  // 应用模型的默认参数
+  function applyModelDefaultParams(modelId, suffix) {
+    const modelConfig = state.models.find(m => m.id.toLowerCase() === modelId.toLowerCase());
+    if (!modelConfig || !modelConfig.default_params) return;
+    
+    const params = modelConfig.default_params;
+    
+    // 应用 guidance_scale
+    if (params.guidance_scale !== undefined) {
+      const el = qs(`#guidance_scale${suffix}`);
+      if (el) el.value = params.guidance_scale;
+    }
+    
+    // 应用 num_inference_steps
+    if (params.num_inference_steps !== undefined) {
+      const el = qs(`#num_inference_steps${suffix}`);
+      if (el) el.value = params.num_inference_steps;
+    }
+    
+    // 应用 shift
+    if (params.shift !== undefined) {
+      const el = qs(`#shift${suffix}`);
+      if (el) el.value = params.shift;
+    }
+    
+    // 应用 max_sequence_length
+    if (params.max_sequence_length !== undefined) {
+      const el = qs(`#max_sequence_length${suffix}`);
+      if (el) el.value = params.max_sequence_length;
+    }
   }
 
   function currentParams() {
     const isMobile = window.innerWidth <= 768;
     const prefix = isMobile ? 'Mobile' : '';
-    return {
-      model: qs(`#modelSelect${prefix}`).value || '',
+    const modelId = qs(`#modelSelect${prefix}`).value || '';
+    const modelConfig = state.models.find(m => m.id === modelId);
+    
+    const params = {
+      model: modelId,
       prompt: (qs(`#prompt${prefix}`).value || '').trim(),
       negative_prompt: (qs(`#negative_prompt${prefix}`).value || '').trim(),
       width: Number(qs(`#width${prefix}`).value) || 1024,
       height: Number(qs(`#height${prefix}`).value) || 1024,
       guidance_scale: Number(qs(`#guidance_scale${prefix}`).value) || 6,
       num_inference_steps: Number(qs(`#num_inference_steps${prefix}`).value) || 20,
-      seed: state.seedRandom ? null : 0
+      true_cfg_scale: Number(qs(`#true_cfg_scale${prefix}`)?.value) || 4,
+      image_b64s: state.imageB64s ? state.imageB64s.slice(0, 3) : [],
+      seed: state.seedRandom ? null : 0,
+      resolution: (qs(`#resolution${prefix}`) && qs(`#resolution${prefix}`).value) || ''
     };
+    
+    // 添加 Z-Image-Turbo 特定参数（从 UI 控件读取）
+    const shiftEl = qs(`#shift${prefix}`);
+    const maxSeqEl = qs(`#max_sequence_length${prefix}`);
+    if (shiftEl && shiftEl.offsetParent !== null) {
+      params.shift = Number(shiftEl.value) || 3.0;
+    }
+    if (maxSeqEl && maxSeqEl.offsetParent !== null) {
+      params.max_sequence_length = Number(maxSeqEl.value) || 512;
+    }
+    
+    return params;
   }
 
   function createPlaceholderCard(i, params) {
@@ -961,11 +1209,10 @@
     const img = document.createElement('img');
     img.src = dataUrl;
     img.alt = params.prompt || 'image';
-    img.style.cursor = 'zoom-in';
-    img.addEventListener('click', function(e) {
-      e.preventDefault();
-      e.stopPropagation();
-      openImageViewer(dataUrl, params);
+    
+    // 添加点击放大功能
+    img.addEventListener('click', () => {
+      showImageModal(dataUrl, params);
     });
     
     const meta = document.createElement('div');
@@ -1188,6 +1435,8 @@ function isViewerOpen() {
     const rect = btn.getBoundingClientRect();
     dragState.initialX = rect.left;
     dragState.initialY = rect.top;
+    dragState.currentX = rect.left;
+    dragState.currentY = rect.top;
 
     e.preventDefault();
   }
@@ -1225,14 +1474,17 @@ function isViewerOpen() {
   }
 
   function endDrag(e) {
-    if (!dragState.isDragging) return;
-
     const btn = qs('#mobileGenerateBtn');
     if (!btn) return;
 
+    const wasDragging = dragState.isDragging;
+    
+    // 立即清除拖拽状态
     dragState.isDragging = false;
     btn.classList.remove('dragging');
 
+    if (!wasDragging) return;
+
     // 如果移动距离很小，视为点击
     const moveDistance = Math.sqrt(
       Math.pow(dragState.currentX - dragState.initialX, 2) +
@@ -1241,13 +1493,13 @@ function isViewerOpen() {
 
     if (moveDistance < 10) {
       // 触发生成
-      generate();
+      setTimeout(() => generate(), 50);
     }
 
     // 保存位置
     ls.set('generateBtnPosition', {
-      x: dragState.currentX,
-      y: dragState.currentY
+      x: dragState.currentX || dragState.initialX,
+      y: dragState.currentY || dragState.initialY
     });
   }
 
@@ -1331,6 +1583,43 @@ function isViewerOpen() {
     return new Blob([u8], { type: mime });
   }
 
+  // 将文件读取为去掉 data: 前缀的纯 base64，限制最多3张
+  async function filesToBase64Raw(fileList) {
+    const files = Array.from(fileList).slice(0, 3);
+    const arr = [];
+    for (const f of files) {
+      const b64 = await new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.onload = () => {
+          const s = String(reader.result || '');
+          const idx = s.indexOf(',');
+          resolve(idx >= 0 ? s.slice(idx + 1) : s);
+        };
+        reader.onerror = () => reject(reader.error || new Error('read failed'));
+        reader.readAsDataURL(f);
+      });
+      arr.push(b64);
+    }
+    return arr;
+  }
+
+  function handleImagesChange(inputEl, statusElId) {
+    try {
+      const files = inputEl && inputEl.files ? inputEl.files : [];
+      if (!files || files.length === 0) {
+        state.imageB64s = [];
+        const st = qs('#' + statusElId);
+        if (st) st.textContent = '未选择';
+        return;
+      }
+      filesToBase64Raw(files).then(list => {
+        state.imageB64s = list;
+        const st = qs('#' + statusElId);
+        if (st) st.textContent = '已选择 ' + list.length + ' 张';
+      }).catch(() => {});
+    } catch(e) {}
+  }
+
   async function saveToChosenFolder(filename, dataUrl) {
     if (!state.folderHandle) return false;
     try {
@@ -1474,6 +1763,11 @@ function isViewerOpen() {
       alert('模型与提示词必填');
       return;
     }
+    // qwen-image-edit 需要至少一张参考图
+    if ((p.model || '').toLowerCase() === 'qwen-image-edit' && (!state.imageB64s || state.imageB64s.length < 1)) {
+      alert('qwen-image-edit 需要至少 1 张参考图');
+      return;
+    }
     
     const isMobile = window.innerWidth <= 768;
     const batchElement = qs(isMobile ? '#batchCountMobile' : '#batchCount');
@@ -1488,15 +1782,35 @@ function isViewerOpen() {
     const tasks = [];
     for (let i = 1; i <= count; i++) {
       const placeholder = createPlaceholderCard(i, p);
-      const args = {
+      const isQwenEdit = (p.model || '').toLowerCase() === 'qwen-image-edit';
+      const argsBase = {
         prompt: p.prompt,
         negative_prompt: p.negative_prompt || '',
-        width: p.width,
-        height: p.height,
         guidance_scale: p.guidance_scale,
         num_inference_steps: p.num_inference_steps,
         seed: state.seedRandom ? genRandomSeed() : 0
       };
+      const args = isQwenEdit
+        ? {
+            ...argsBase,
+            width: p.width,
+            height: p.height,
+            true_cfg_scale: Number(qs(`#true_cfg_scale${isMobile ? 'Mobile' : ''}`)?.value) || 4,
+            ...(state.imageB64s && state.imageB64s.length ? { image_b64s: state.imageB64s.slice(0, 3) } : {})
+          }
+        : {
+            ...argsBase,
+            width: p.width,
+            height: p.height
+          };
+      // hidream 期望使用 resolution 字段
+      if ((p.model || '').toLowerCase() === 'hidream') {
+        args.resolution = (p.resolution && typeof p.resolution === 'string' && p.resolution.includes('x'))
+          ? p.resolution
+          : `${p.width}x${p.height}`;
+        delete args.width;
+        delete args.height;
+      }
       const body = { model: p.model, input_args: args };
       
       const task = (async () => {
@@ -1604,6 +1918,12 @@ function isViewerOpen() {
     
     qs('#chooseFolder').addEventListener('click', chooseFolder);
     qs('#generateBtn').addEventListener('click', generate);
+
+    // 参考图选择事件
+    const imagesEl = qs('#images');
+    if (imagesEl) imagesEl.addEventListener('change', () => handleImagesChange(imagesEl, 'imagesStatus'));
+    const imagesElM = qs('#imagesMobile');
+    if (imagesElM) imagesElM.addEventListener('change', () => handleImagesChange(imagesElM, 'imagesStatusMobile'));
     
     // 移动端事件绑定
     qs('#mobileMenuToggle').addEventListener('click', toggleSidebar);
@@ -1622,6 +1942,12 @@ function isViewerOpen() {
       generate();
       closeSidebar();
     });
+
+    // 模型切换时动态显示/隐藏特定参数
+    const ms = qs('#modelSelect');
+    if (ms) ms.addEventListener('change', () => updateVisibleFieldsFor(''));
+    const msm = qs('#modelSelectMobile');
+    if (msm) msm.addEventListener('change', () => updateVisibleFieldsFor('Mobile'));
     
     // 初始化拖拽功能
     initDragButton();
@@ -1694,7 +2020,65 @@ function isViewerOpen() {
     fetchModels();
   }
 
+  // 大图预览功能
+  function showImageModal(imageUrl, params) {
+    const modal = qs('#imageModal');
+    const modalImg = qs('#imageModalImg');
+    const modalInfo = qs('#imageModalInfo');
+    
+    modalImg.src = imageUrl;
+    if (params) {
+      modalInfo.textContent = `${params.width}×${params.height} | ${params.model}`;
+    } else {
+      modalInfo.textContent = '';
+    }
+    modal.classList.add('show');
+    
+    // 阻止背景滚动
+    document.body.style.overflow = 'hidden';
+  }
+
+  function closeImageModal() {
+    const modal = qs('#imageModal');
+    modal.classList.remove('show');
+    document.body.style.overflow = '';
+  }
+
+  // 设置模态框事件监听
+  function setupImageModal() {
+    const modal = qs('#imageModal');
+    const closeBtn = qs('#imageModalClose');
+    const modalImg = qs('#imageModalImg');
+    
+    if (closeBtn) {
+      closeBtn.addEventListener('click', (e) => {
+        e.stopPropagation();
+        closeImageModal();
+      });
+    }
+    
+    if (modal) {
+      modal.addEventListener('click', (e) => {
+        if (e.target === modal) {
+          closeImageModal();
+        }
+      });
+    }
+    
+    if (modalImg) {
+      modalImg.addEventListener('click', closeImageModal);
+    }
+    
+    // ESC键关闭
+    document.addEventListener('keydown', (e) => {
+      if (e.key === 'Escape' && modal.classList.contains('show')) {
+        closeImageModal();
+      }
+    });
+  }
+
   init();
+  setupImageModal();
 </script>
 </body>
 </html>

server.js

@@ -36,7 +36,7 @@ const ALLOW_CLIENT_API_KEY = /^true$/i.test(process.env.ALLOW_CLIENT_API_KEY ||
 // Strict switches to close any possibility of routing/fallback
 // - STRICT_NO_ROUTING=true 不做本地映射，除非前端或调用方显式传 upstream_id
 // - STRICT_NO_FALLBACK=true 强制禁用回落（即使前端未设置 no_fallback）
-const STRICT_NO_ROUTING = /^true$/i.test(process.env.STRICT_NO_ROUTING || 'true');
+const STRICT_NO_ROUTING = /^true$/i.test(process.env.STRICT_NO_ROUTING || 'false');
 const STRICT_NO_FALLBACK = /^true$/i.test(process.env.STRICT_NO_FALLBACK || 'true');
 // Auto fallback to another model when upstream capacity/infrastructure errors
 const AUTO_FALLBACK = /^true$/i.test(process.env.AUTO_FALLBACK || 'true');
@@ -52,12 +52,16 @@ const FORCE_MINIMAL = /^true$/i.test(process.env.FORCE_MINIMAL || 'false');
 app.use(helmet({
   crossOriginResourcePolicy: { policy: 'cross-origin' },
   // Allow embedding on Hugging Face Spaces (disable X-Frame-Options)
-  frameguard: false
+  frameguard: false,
+  // Avoid COOP/COEP blocking when embedded in an iframe
+  crossOriginOpenerPolicy: { policy: 'same-origin-allow-popups' },
+  crossOriginEmbedderPolicy: false,
+  originAgentCluster: false
 }));
 
 // Enable CSP and allow inline script/style for this SPA.
 // Also allow connections to the upstream image API.
-// Allow embedding inside Hugging Face Spaces iframe via frame-ancestors
+// Allow embedding inside Hugging Face Spaces iframe via frame-ancestors/frame-src
 app.use(helmet.contentSecurityPolicy({
   useDefaults: true,
   directives: {
@@ -74,7 +78,8 @@ app.use(helmet.contentSecurityPolicy({
     // Allow CSS sourcemap requests to Baomitu CDN
     "connect-src": ["'self'", "https://image.chutes.ai", "https://lib.baomitu.com"],
     "media-src": ["'self'", "data:", "blob:"],
-    "frame-ancestors": ["'self'", "https://huggingface.co", "https://*.huggingface.co"]
+    "frame-src": ["'self'", "https://huggingface.co", "https://*.huggingface.co", "https://*.hf.space"],
+    "frame-ancestors": ["'self'", "https://huggingface.co", "https://*.huggingface.co", "https://*.hf.space"]
   }
 }));
 
@@ -86,7 +91,8 @@ app.use((req, res, next) => {
 
 app.use(cors());
 app.use(compression());
-app.use(express.json({ limit: '2mb' }));
+app.use(express.json({ limit: '50mb' }));
+app.use(express.urlencoded({ limit: '50mb', extended: true }));
 app.use(morgan(LOG_LEVEL));
 
 // Static files
@@ -224,11 +230,25 @@ app.get('/api/models', async (req, res) => {
         const free = typeof m.free === 'boolean' ? m.free : false;
         return { id, name, free };
       });
-      // Merge free flags from local mapping
+      // Merge free flags and default_params from local mapping
       if (localList.length) {
-        // 先合并免费标记
+        // Merge free flags for models that exist remotely
         models = mergeFreeFlags(models, localList);
-        // 再把仅存在于本地配置但远端没有的模型追加进去（并集）
+        // Also merge default_params from local config
+        const localMap = new Map();
+        for (const lm of localList) {
+          const key = ((lm.id || lm.name || '') + '').toLowerCase();
+          if (key) localMap.set(key, lm);
+        }
+        models = models.map(m => {
+          const key = ((m.id || m.name || '') + '').toLowerCase();
+          const local = localMap.get(key);
+          if (local && local.default_params) {
+            return { ...m, default_params: local.default_params };
+          }
+          return m;
+        });
+        // Also append local-only models (union), so new models in local config are visible in frontend
         const remoteKeys = new Set(models.map(m => ((m.id || m.name || '') + '').toLowerCase()));
         for (const lm of localList) {
           const key = ((lm.id || lm.name || '') + '').toLowerCase();
@@ -236,7 +256,9 @@ app.get('/api/models', async (req, res) => {
             const id = (lm.id || lm.name || '').toString();
             const name = (lm.name || id).toString();
             const free = !!lm.free;
-            models.push({ id, name, free });
+            const model = { id, name, free };
+            if (lm.default_params) model.default_params = lm.default_params;
+            models.push(model);
             remoteKeys.add(key);
           }
         }
@@ -249,7 +271,9 @@ app.get('/api/models', async (req, res) => {
       const id = (m.id || m.slug || m.model || m.name || `model-${idx}`).toString();
       const name = (m.name || id).toString();
       const free = !!m.free;
-      return { id, name, free };
+      const model = { id, name, free };
+      if (m.default_params) model.default_params = m.default_params;
+      return model;
     });
     return res.json({ source: 'local', models: normalized });
   } catch (err) {
@@ -288,8 +312,8 @@ app.post('/api/generate', async (req, res) => {
       negative_prompt: (body.negative_prompt ?? (body.input_args ? body.input_args.negative_prompt : undefined) ?? '').toString(),
       width: clamp(parseInt(body.width ?? (body.input_args ? body.input_args.width : 1024), 10) || 1024, 128, 2048),
       height: clamp(parseInt(body.height ?? (body.input_args ? body.input_args.height : 1024), 10) || 1024, 128, 2048),
-      guidance_scale: clamp(parseFloat(body.guidance_scale ?? (body.input_args ? body.input_args.guidance_scale : 7.5)) || 7.5, 1, 20),
-      num_inference_steps: clamp(parseInt(body.num_inference_steps ?? (body.input_args ? body.input_args.num_inference_steps : 25), 10) || 25, 1, 50),
+      guidance_scale: clamp(parseFloat(body.guidance_scale ?? (body.input_args ? body.input_args.guidance_scale : 7.5)) || 7.5, 0, 20),
+      num_inference_steps: clamp(parseInt(body.num_inference_steps ?? (body.input_args ? body.input_args.num_inference_steps : 25), 10) || 25, 1, 100),
       // Seed: support top-level or input_args.seed; if missing/null -> null (omit from payload)
       seed: (() => {
         const raw = (body.seed ?? (body.input_args ? body.input_args.seed : undefined));
@@ -336,9 +360,17 @@ app.post('/api/generate', async (req, res) => {
       return null;
     }
     const cfg = getModelConfig(localList, flat.model);
-    const generateUrl = (cfg && cfg.upstream_url) ? cfg.upstream_url : GENERATE_API_URL;
-    const preferMinimal = FORCE_MINIMAL || !!(cfg && cfg.minimal === true);
-
+    let generateUrl = (cfg && cfg.upstream_url) ? cfg.upstream_url : GENERATE_API_URL;
+    let preferMinimal = FORCE_MINIMAL || !!(cfg && cfg.minimal === true);
+    const isHidream = (
+      typeof flat.model === 'string' && flat.model.toLowerCase() === 'hidream'
+    ) || /hidream/i.test(generateUrl) || /hidream/i.test(String(targetModel || ''));
+    const isQwenEdit = (
+      typeof flat.model === 'string' && flat.model.toLowerCase() === 'qwen-image-edit'
+    ) || /qwen-image-edit/i.test(generateUrl) || /qwen-image-edit/i.test(String(targetModel || ''));
+    const isZImageTurbo = (
+      typeof flat.model === 'string' && flat.model.toLowerCase() === 'z-image-turbo'
+    ) || /z-image-turbo/i.test(generateUrl) || /z-image-turbo/i.test(String(targetModel || ''));
 
 
     const apiToken = req.headers['x-api-key'] || CHUTES_API_TOKEN;
@@ -348,39 +380,156 @@ app.post('/api/generate', async (req, res) => {
       ...(apiToken ? { 'Authorization': `Bearer ${apiToken}` } : {})
     };
 
+    // hidream: 优先使用 models.json 的 upstream_url；否则使用 HIDREAM_UPSTREAM_URL；否则保持默认 GENERATE_API_URL
+    if (isHidream) {
+      const envUrl = process.env.HIDREAM_UPSTREAM_URL || '';
+      function isValidUrl(u) {
+        try { new URL(u); return true; } catch { return false; }
+      }
+      if (cfg && cfg.upstream_url && isValidUrl(cfg.upstream_url)) {
+        generateUrl = cfg.upstream_url;
+      } else if (envUrl && isValidUrl(envUrl)) {
+        generateUrl = envUrl;
+      }
+    }
+
+    // Normalize special-case upstream ids that differ from local display ids
+    // qwen-image-edit 在上游共用 qwen-image 的路由/标识
+    if (isQwenEdit && String(targetModel || '').toLowerCase() === 'qwen-image-edit') {
+      targetModel = 'qwen-image';
+    }
+
+    // Pass-through extras (e.g., image_b64s, true_cfg_scale, resolution, shift, max_sequence_length, etc.)
+    const inputExtras = (body && typeof body.input_args === 'object') ? { ...body.input_args } : {};
+    if (isHidream) {
+      // hidream 仅接受 resolution；确保存在并移除 width/height 噪声
+      if (!inputExtras.resolution) {
+        inputExtras.resolution = `${flat.width}x${flat.height}`;
+      }
+      delete inputExtras.width;
+      delete inputExtras.height;
+    }
+    if (!isQwenEdit) {
+      // 非 qwen-image-edit 时不传参考图与 true_cfg_scale
+      delete inputExtras.image_b64s;
+      delete inputExtras.true_cfg_scale;
+    }
+    // Z-Image-Turbo 特殊参数处理
+    if (isZImageTurbo) {
+      // 保留 shift 和 max_sequence_length 参数
+      if (inputExtras.shift === undefined) {
+        inputExtras.shift = 3.0; // 默认值
+      }
+      if (inputExtras.max_sequence_length === undefined) {
+        inputExtras.max_sequence_length = 512; // 默认值
+      }
+    }
+
+    // Build top-level extras for flat payloads (some upstreams expect image_b64s/true_cfg_scale at top-level)
+    const topLevelExtras = {};
+    const maybeImageB64s = (body && (body.image_b64s ?? (body.input_args && body.input_args.image_b64s)));
+    const maybeTrueCfg = (body && (body.true_cfg_scale ?? (body.input_args && body.input_args.true_cfg_scale)));
+    if (isQwenEdit) {
+      if (maybeImageB64s) topLevelExtras.image_b64s = maybeImageB64s;
+      if (maybeTrueCfg !== undefined && maybeTrueCfg !== null) topLevelExtras.true_cfg_scale = maybeTrueCfg;
+    }
+
+    // qwen-image-edit: 校验参考图数量（1-3）
+    if (isQwenEdit) {
+      const imgs = inputExtras.image_b64s || topLevelExtras.image_b64s;
+      const validCount = Array.isArray(imgs) ? imgs.length : 0;
+      if (validCount < 1 || validCount > 3) {
+        return res.status(400).json({ ok: false, error: 'qwen-image-edit 需要 1-3 张参考图 (image_b64s)' });
+      }
+    }
+
+    const commonArgs = {
+      prompt: flat.prompt,
+      negative_prompt: flat.negative_prompt || '',
+      guidance_scale: flat.guidance_scale,
+      num_inference_steps: flat.num_inference_steps,
+      ...(flat.seed !== null ? { seed: flat.seed } : {})
+    };
     const variantA = {
       model: targetModel,
+      input_args: isHidream
+        ? { ...inputExtras, ...commonArgs }
+        : { ...inputExtras, ...commonArgs, width: flat.width, height: flat.height }
+    };
+
+    const variantB = isHidream
+      ? {
+          model: targetModel,
+          input_args: { ...inputExtras, ...commonArgs }
+        }
+      : {
+          model: targetModel,
+          ...topLevelExtras,
+          ...commonArgs,
+          width: flat.width,
+          height: flat.height
+        };
+
+    // Hidream-specific flat payload expected by chutes-hidream endpoint (no input_args)
+    const variantHidreamFlat = isHidream ? {
+      prompt: flat.prompt,
+      resolution: (inputExtras && inputExtras.resolution) ? String(inputExtras.resolution) : `${flat.width}x${flat.height}`,
+      guidance_scale: flat.guidance_scale,
+      num_inference_steps: flat.num_inference_steps,
+      ...(flat.seed !== null ? { seed: flat.seed } : {})
+    } : null;
+
+    // Z-Image-Turbo payload with input_args wrapper (required by the endpoint)
+    const variantZImageNested = isZImageTurbo ? {
       input_args: {
         prompt: flat.prompt,
-        negative_prompt: flat.negative_prompt || '',
-        width: flat.width,
         height: flat.height,
-        guidance_scale: flat.guidance_scale,
+        width: flat.width,
         num_inference_steps: flat.num_inference_steps,
+        guidance_scale: flat.guidance_scale,
+        shift: (inputExtras && inputExtras.shift !== undefined) ? Number(inputExtras.shift) : 3.0,
+        max_sequence_length: (inputExtras && inputExtras.max_sequence_length !== undefined) ? Number(inputExtras.max_sequence_length) : 512,
         ...(flat.seed !== null ? { seed: flat.seed } : {})
       }
-    };
+    } : null;
 
-    const variantB = {
-      model: targetModel,
-      prompt: flat.prompt,
-      negative_prompt: flat.negative_prompt || '',
-      width: flat.width,
-      height: flat.height,
-      guidance_scale: flat.guidance_scale,
-      num_inference_steps: flat.num_inference_steps,
-      ...(flat.seed !== null ? { seed: flat.seed } : {})
-    };
+    // Z-Image-Turbo minimal payload (top-level prompt only, as shown in curl example)
+    const variantZImageMinimal = isZImageTurbo ? {
+      prompt: flat.prompt
+    } : null;
 
     // Minimal payload (some models reject extended fields). Include size/steps/seed for hunyuan-image-3 compatibility
     const variantCMinimal = {
       model: targetModel,
+      input_args: {
+        prompt: flat.prompt,
+        size: `${flat.width}x${flat.height}`,
+        steps: flat.num_inference_steps,
+        ...(flat.seed !== null ? { seed: flat.seed } : {})
+      }
+    };
+
+    // Flat minimal payload for model-specific upstreams that expect top-level { prompt }
+    const variantFlatMinimal = {
       prompt: flat.prompt,
       size: `${flat.width}x${flat.height}`,
       steps: flat.num_inference_steps,
       ...(flat.seed !== null ? { seed: flat.seed } : {})
     };
 
+    // Qwen-image-edit: official top-level flat payload (no model, includes refs)
+    const variantQwenFlat = isQwenEdit ? {
+      prompt: flat.prompt,
+      negative_prompt: flat.negative_prompt || '',
+      width: flat.width,
+      height: flat.height,
+      guidance_scale: flat.guidance_scale,
+      num_inference_steps: flat.num_inference_steps,
+      ...(flat.seed !== null ? { seed: flat.seed } : {}),
+      ...(inputExtras && inputExtras.image_b64s ? { image_b64s: inputExtras.image_b64s } : (topLevelExtras.image_b64s ? { image_b64s: topLevelExtras.image_b64s } : {})),
+      ...(inputExtras && (inputExtras.true_cfg_scale !== undefined && inputExtras.true_cfg_scale !== null) ? { true_cfg_scale: inputExtras.true_cfg_scale } : (topLevelExtras.true_cfg_scale !== undefined ? { true_cfg_scale: topLevelExtras.true_cfg_scale } : {}))
+    } : null;
+
     // duplicate removed
 
     async function tryCall(payload, label, url) {
@@ -394,14 +543,16 @@ app.post('/api/generate', async (req, res) => {
         return { ok: true, imageBase64: base64, contentType: ctype, tried: label };
       }
 
-      // Success: JSON payload that contains image data
+      // Success: JSON response that may contain base64 or data URL
       if (status >= 200 && status < 300 && /application\/json/i.test(ctype)) {
         let raw = '';
         try { raw = Buffer.from(resp.data).toString(); } catch (e) {}
         try {
           const j = JSON.parse(raw || '{}');
+          // Common patterns: { image: "data:..."} or { image: "<base64>", contentType: "image/jpeg" } or { data: "<base64>" }
           if (j && j.image) {
             if (typeof j.image === 'string' && j.image.startsWith('data:')) {
+              // Already data URL; extract base64 and contentType
               const match = /^data:([^;]+);base64,(.*)$/i.exec(j.image);
               if (match) {
                 return { ok: true, imageBase64: match[2], contentType: match[1], tried: label };
@@ -416,13 +567,17 @@ app.post('/api/generate', async (req, res) => {
             return { ok: true, imageBase64: j.data, contentType: ct, tried: label };
           }
         } catch (e) {
-          // fallthrough
+          // fallthrough to error mapping below
         }
       }
 
-      // Error mapping
+      // Error handling branch (non-2xx or unrecognized payload)
       let raw = '';
-      try { raw = Buffer.from(resp.data).toString(); } catch (e) {}
+      try {
+        raw = Buffer.from(resp.data).toString();
+      } catch (e) {}
+
+      // Friendly diagnostics mapping
       let code = 'UPSTREAM_ERROR';
       let hint = '';
       let mappedStatus = status;
@@ -433,11 +588,12 @@ app.post('/api/generate', async (req, res) => {
       } catch (e) {
         detailText = raw;
       }
+
       const lower = (detailText || '').toLowerCase();
       if (lower.includes('exhausted all available targets')) {
         code = 'UPSTREAM_CAPACITY_EXHAUSTED';
         hint = '上游容量不足（GPU/目标不可用或排队中），请稍后重试、换模型，或降低分辨率/步数。';
-        mappedStatus = 503;
+        mappedStatus = 503; // service unavailable
       } else if (status === 404 && lower.includes('model not found')) {
         code = 'UPSTREAM_MODEL_NOT_FOUND';
         hint = '上游模型不存在或标识不匹配。请更换模型，或在 data/models.json 为该模型添加正确的 \"upstream_id\" 映射后重试。';
@@ -455,87 +611,146 @@ app.post('/api/generate', async (req, res) => {
 
     let result;
 
-    // If this model prefers minimal payload (e.g. hunyuan-image-3), try minimal first
+    // If the model prefers minimal payload, choose ordering per model.
+    // For hunyuan-image-3: nested-minimal (input_args with size) FIRST to ensure size is honored.
+    // For Z-Image-Turbo: use dedicated nested payload FIRST
     if (preferMinimal) {
-      try {
-        result = await tryCall(variantCMinimal, 'minimal', generateUrl);
-      } catch (e0) { /* continue */ }
-    }
-    else {
-      try {
-        result = await tryCall(variantA, 'nested', generateUrl);
-      } catch (e1) {
+      const isHunyuan =
+        (typeof flat.model === 'string' && flat.model.toLowerCase() === 'hunyuan-image-3') ||
+        /hunyuan-image-3/i.test(generateUrl) ||
+        /hunyuan-image-3/i.test(String(targetModel || ''));
+      
+      if (isZImageTurbo) {
+        // Z-Image-Turbo: try minimal payload first (as shown in curl example)
+        if (variantZImageMinimal) {
+          try {
+            result = await tryCall(variantZImageMinimal, 'z-image-turbo-minimal', generateUrl);
+          } catch (e0) {}
+        }
+        // If minimal fails, try full nested payload
+        if (!result && variantZImageNested) {
+          try {
+            result = await tryCall(variantZImageNested, 'z-image-turbo-nested', generateUrl);
+          } catch (e1) {}
+        }
+      } else if (isHunyuan) {
         try {
-          result = await tryCall(variantB, 'flat', generateUrl);
-        } catch (e2) {
-                  // Auto fallback to another model when capacity/infrastructure errors (disabled when NO_FALLBACK=true)
-                  const capacityCodes = ['UPSTREAM_CAPACITY_EXHAUSTED','UPSTREAM_NO_INSTANCES','UPSTREAM_INFRASTRUCTURE','UPSTREAM_BAD_GATEWAY'];
-                  if (AUTO_FALLBACK && !NO_FALLBACK && capacityCodes.includes(e2.code || '') ) {
-            // choose fallback model (prefer free and different from current)
-            function chooseFallback(currentId, list) {
-              const key = (currentId || '').toLowerCase();
-              const free = list.filter(m => m.free && (m.id || m.name || '').toLowerCase() !== key);
-              if (free.length) return (free[0].upstream_id || free[0].id || free[0].name);
-              const any = list.find(m => (m.id || m.name || '').toLowerCase() !== key);
-              if (any) return (any.upstream_id || any.id || any.name);
-              return null;
-            }
-            const fallbackModel = chooseFallback(targetModel, localList);
-            if (fallbackModel && fallbackModel !== targetModel) {
-              const fbA = { ...variantA, model: fallbackModel };
-              const fbB = { ...variantB, model: fallbackModel };
-              // Choose URL for fallback model
-              const fbCfg = getModelConfig(localList, fallbackModel);
-              const fbUrl = (fbCfg && fbCfg.upstream_url) ? fbCfg.upstream_url : GENERATE_API_URL;
-              try {
-                result = await tryCall(fbA, 'nested-fallback', fbUrl);
-              } catch (e3) {
-                try {
-                  result = await tryCall(fbB, 'flat-fallback', fbUrl);
-                } catch (e4) {
-                  const status = e4.status || 502;
-                  return res.status(status).json({
-                    ok: false,
-                    error: e4.hint || e4.message || 'Upstream error',
-                    code: e4.code || 'UPSTREAM_ERROR',
-                    upstream_model: targetModel,
-                    fallback_model: fallbackModel
-                  });
-                }
-              }
-              // success with fallback
-              return res.json({
-                ok: true,
-                image: `data:${result.contentType};base64,${result.imageBase64}`,
-                contentType: result.contentType,
-                meta: {
-                  model: flat.model,
+          result = await tryCall(variantCMinimal, 'nested-minimal', generateUrl);
+        } catch (e0) {}
+        if (!result) {
+          try {
+            result = await tryCall(variantFlatMinimal, 'flat-minimal', generateUrl);
+          } catch (e1) {}
+        }
+      } else {
+        try {
+          result = await tryCall(variantFlatMinimal, 'flat-minimal', generateUrl);
+        } catch (e0) {}
+        if (!result) {
+          try {
+            result = await tryCall(variantCMinimal, 'nested-minimal', generateUrl);
+          } catch (e1) {}
+        }
+      }
+    }
+
+    // Only try full payload if minimal didn't succeed
+    if (!result) {
+      let lastError = null;
+
+      if (!result) {
+        try { result = await tryCall(variantA, 'nested', generateUrl); }
+        catch (e1) { lastError = e1; }
+      }
+
+      if (!result) {
+        try { result = await tryCall(variantB, 'flat', generateUrl); }
+        catch (e2) { lastError = e2; }
+      }
+
+      // qwen-image-edit official flat payload (no model)
+      if (!result && isQwenEdit && variantQwenFlat) {
+        try { result = await tryCall(variantQwenFlat, 'qwen-flat', generateUrl); }
+        catch (eQ) { lastError = eQ; }
+      }
+
+      // hidream official flat payload (no model)
+      if (!result && isHidream && variantHidreamFlat) {
+        try { result = await tryCall(variantHidreamFlat, 'hidream-flat', generateUrl); }
+        catch (eH) { lastError = eH; }
+      }
+
+      // Z-Image-Turbo nested payload - fallback if not tried in minimal mode
+      if (!result && isZImageTurbo && variantZImageNested && !preferMinimal) {
+        try { result = await tryCall(variantZImageNested, 'z-image-turbo-nested', generateUrl); }
+        catch (eZ) { lastError = eZ; }
+      }
+
+      if (!result) {
+        // Auto fallback to another model when capacity/infrastructure errors (disabled when NO_FALLBACK=true)
+        const capacityCodes = ['UPSTREAM_CAPACITY_EXHAUSTED','UPSTREAM_NO_INSTANCES','UPSTREAM_INFRASTRUCTURE','UPSTREAM_BAD_GATEWAY'];
+        if (AUTO_FALLBACK && !NO_FALLBACK && lastError && capacityCodes.includes(lastError.code || '')) {
+          function chooseFallback(currentId, list) {
+            const key = (currentId || '').toLowerCase();
+            const free = list.filter(m => m.free && (m.id || m.name || '').toLowerCase() !== key);
+            if (free.length) return (free[0].upstream_id || free[0].id || free[0].name);
+            const any = list.find(m => (m.id || m.name || '').toLowerCase() !== key);
+            if (any) return (any.upstream_id || any.id || any.name);
+            return null;
+          }
+          const fallbackModel = chooseFallback(targetModel, localList);
+          if (fallbackModel && fallbackModel !== targetModel) {
+            const fbA = { ...variantA, model: fallbackModel };
+            const fbB = { ...variantB, model: fallbackModel };
+            const fbCfg = getModelConfig(localList, fallbackModel);
+            const fbUrl = (fbCfg && fbCfg.upstream_url) ? fbCfg.upstream_url : GENERATE_API_URL;
+
+            try { result = await tryCall(fbA, 'nested-fallback', fbUrl); }
+            catch (e3) {
+              try { result = await tryCall(fbB, 'flat-fallback', fbUrl); }
+              catch (e4) {
+                const status = e4.status || 502;
+                return res.status(status).json({
+                  ok: false,
+                  error: e4.hint || e4.message || 'Upstream error',
+                  code: e4.code || 'UPSTREAM_ERROR',
                   upstream_model: targetModel,
-                  fallback_used: true,
-                  fallback_model: fallbackModel,
-                  width: flat.width,
-                  height: flat.height,
-                  guidance_scale: flat.guidance_scale,
-                  num_inference_steps: flat.num_inference_steps,
-                  seed: flat.seed
-                },
-                tried: result.tried
-              });
+                  fallback_model: fallbackModel
+                });
+              }
             }
+
+            // success with fallback
+            return res.json({
+              ok: true,
+              image: `data:${result.contentType};base64,${result.imageBase64}`,
+              contentType: result.contentType,
+              meta: {
+                model: flat.model,
+                upstream_model: targetModel,
+                fallback_used: true,
+                fallback_model: fallbackModel,
+                width: flat.width,
+                height: flat.height,
+                guidance_scale: flat.guidance_scale,
+                num_inference_steps: flat.num_inference_steps,
+                seed: flat.seed
+              },
+              tried: result.tried
+            });
           }
-          const status = e2.status || 502;
-          return res.status(status).json({
-            ok: false,
-            error: e2.hint || e2.message || 'Upstream error',
-            code: e2.code || 'UPSTREAM_ERROR',
-            upstream_model: targetModel
-          });
         }
+
+        const status = (lastError && lastError.status) || 502;
+        return res.status(status).json({
+          ok: false,
+          error: (lastError && (lastError.hint || lastError.message)) || 'Upstream error',
+          code: (lastError && lastError.code) || 'UPSTREAM_ERROR',
+          upstream_model: targetModel
+        });
       }
     }
 
-    
-
     return res.json({
       ok: true,
       image: `data:${result.contentType};base64,${result.imageBase64}`,