kingkont 0.7.69 → 0.7.71

package/index.html

@@ -32,7 +32,7 @@
   </div>
 
   <div class="sidebar-section">
-    <h3>Локации <button id="newLocation" disabled title="Создать локацию">+</button></h3>
+    <h3>Общее <button id="newLocation" disabled title="Создать общую доску">+</button></h3>
     <div class="sidebar-list" id="locationList"></div>
   </div>
 
@@ -343,6 +343,7 @@
     <label id="imageModelRow">Модель для картинки
       <div class="seg-control">
         <button class="seg active" data-img-model="nano-banana-2" type="button" title="Высокое качество, медленно">Nano Banana 2</button>
+        <button class="seg" data-img-model="nano-banana-pro" type="button" title="Pro-версия nano-banana, выше качество">Nano Banana Pro</button>
         <button class="seg" data-img-model="grok" type="button">Grok</button>
         <button class="seg" data-img-model="seedream" type="button">Seedream 4.5</button>
         <button class="seg" data-img-model="seedream-5-lite" type="button">Seedream 5 Lite</button>
@@ -350,6 +351,13 @@
         <button class="seg" data-img-model="sdxl-lightning" type="button" title="Очень быстрая (3-5с)">⚡ SDXL Lightning</button>
       </div>
     </label>
+    <label id="imageQualityRow">Качество
+      <div class="seg-control" id="imageQualityCtl">
+        <button class="seg" data-img-quality="low" type="button" title="Быстрее, дешевле">low</button>
+        <button class="seg active" data-img-quality="medium" type="button">medium</button>
+        <button class="seg" data-img-quality="high" type="button" title="Лучше детализация, медленнее">high</button>
+      </div>
+    </label>
     <label id="imageOptionsRow">Соотношение сторон
       <div class="seg-control" id="imageAspectCtl">
         <button class="seg" data-img-asp="source" type="button" id="imgAspSource"
@@ -437,7 +445,7 @@
     <label id="charsPickRow" style="display:none;">Персонажи
       <div class="picker-chips" id="charsPickChips"></div>
     </label>
-    <label id="locPickRow" style="display:none;">Локация
+    <label id="locPickRow" style="display:none;">Из общего
       <select id="locPickSelect"><option value="">— не выбрана —</option></select>
     </label>
     <!-- Дефолтные промпты сцены (стек чекбоксов; рендерится динамически) -->

package/lib/cli.js

@@ -248,6 +248,7 @@ async function cmdGen({ positional, flags }) {
     aspectRatio: finalAspect,
     resolution: flags.resolution,
     duration: flags.duration,
+    quality: flags.quality,
     firstFrame: flags['first-frame'] || flags.firstFrame,
     lastFrame: flags['last-frame'] || flags.lastFrame,
     settings, flags,
@@ -370,9 +371,9 @@ async function cmdUpload({ positional, flags }) {
 // =============================================================================
 
 async function runMediaGeneration(root, ref, node, args) {
-  const { kind, prompt, modelKey, imageInputs, videoInputs, aspectRatio, resolution, duration, firstFrame, lastFrame, settings, flags } = args;
+  const { kind, prompt, modelKey, imageInputs, videoInputs, aspectRatio, resolution, duration, quality, firstFrame, lastFrame, settings, flags } = args;
   const start = await providers.startGeneration({
-    kind, prompt, modelKey, imageInputs, videoInputs, aspectRatio, resolution, duration, firstFrame, lastFrame, settings,
+    kind, prompt, modelKey, imageInputs, videoInputs, aspectRatio, resolution, duration, quality, firstFrame, lastFrame, settings,
   });
   console.error(`[task] ${start.taskId} provider=${start.provider}`);
   await updateNode(root, ref, node.id, n => {

package/lib/providers.js

@@ -52,6 +52,7 @@ function summarizeBody(body) {
 
 const KIE_IMAGE_MODELS = {
   'nano-banana-2':   'nano-banana-2',
+  'nano-banana-pro': 'nano-banana-pro',
   'grok':            'grok-imagine/text-to-image',
   'seedream':        'seedream/4.5-text-to-image',
   'seedream-5-lite': 'seedream/5-lite-text-to-image',
@@ -212,7 +213,7 @@ async function kiePoll(taskId) {
  */
 async function startGeneration(args) {
   const { kind, prompt, modelKey, imageInputs, videoInputs, firstFrame, lastFrame,
-          aspectRatio, resolution, duration, settings: s } = args;
+          aspectRatio, resolution, duration, quality, settings: s } = args;
   if (kind !== 'image' && kind !== 'video') throw new Error(`unknown kind: ${kind}`);
   if (!prompt && kind !== 'video') throw new Error('prompt обязателен');
 
@@ -229,7 +230,7 @@ async function startGeneration(args) {
   const kieSupportsModel = !!kieMap[kieKey];
 
   if (kieAvailable && kieSupportsModel) {
-    return await _startGenerationViaKie({ kind, prompt, key: kieKey, imageInputs, videoInputs, aspectRatio, resolution, duration });
+    return await _startGenerationViaKie({ kind, prompt, key: kieKey, imageInputs, videoInputs, aspectRatio, resolution, duration, quality });
   }
 
   // Chatium-путь.
@@ -252,6 +253,7 @@ async function startGeneration(args) {
         prompt, model: fullModel, aspectRatio, resolution,
         outputFormat: isSeedream ? 'jpeg' : 'jpg',
       };
+      if (quality) body.quality = quality;  // 'low' | 'medium' | 'high' — модель сама решит как мапить
       if (!isSeedream && Array.isArray(imageInputs) && imageInputs.length) {
         body.imageInputs = imageInputs;
       }
@@ -271,29 +273,31 @@ async function startGeneration(args) {
 
 // Внутренний helper: KIE-путь startGeneration. Вынесен чтобы не дублировать
 // логику между «KIE первичный» и старым «KIE fallback».
-async function _startGenerationViaKie({ kind, prompt, key, imageInputs, videoInputs, aspectRatio, resolution, duration }) {
+async function _startGenerationViaKie({ kind, prompt, key, imageInputs, videoInputs, aspectRatio, resolution, duration, quality }) {
   const map = kind === 'video' ? KIE_VIDEO_MODELS : KIE_IMAGE_MODELS;
   const fullModel = map[key];
   if (!fullModel) throw new Error(`unknown ${kind} model: ${key}`);
 
   const input = { prompt };
   if (kind === 'image') {
-    if (key === 'nano-banana-2') {
+    if (key === 'nano-banana-2' || key === 'nano-banana-pro') {
       if (imageInputs?.length) input.image_input = imageInputs;
       if (aspectRatio) input.aspect_ratio = aspectRatio;
       input.resolution = resolution || '1K';
       input.output_format = 'jpg';
+      if (quality) input.quality = quality;
     } else if (key === 'grok') {
       if (aspectRatio) input.aspect_ratio = aspectRatio;
       input.nsfw_checker = false;
-      input.enable_pro = false;
+      input.enable_pro = quality === 'high';   // pro-mode для high
     } else if (key === 'seedream' || key === 'seedream-5-lite') {
       input.aspect_ratio = aspectRatio || '16:9';
-      input.quality = 'high';
+      input.quality = quality || 'high';
       input.nsfw_checker = false;
     } else if (key === 'flux-schnell' || key === 'sdxl-lightning') {
       if (aspectRatio) input.aspect_ratio = aspectRatio;
       input.output_format = 'jpg';
+      // flux/sdxl быстрые, quality для них N/A — пропускаем.
     }
   } else {
     if (imageInputs?.length) input.reference_image_urls = imageInputs;

package/main.js

@@ -635,7 +635,7 @@ function buildMenu() {
           click: () => trigger('#newCharacter'),
         },
         {
-          label: 'Новая локация',
+          label: 'Новая общая доска',
           enabled: projectOpen,
           click: () => trigger('#newLocation'),
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kingkont",
-  "version": "0.7.69",
+  "version": "0.7.71",
   "description": "KingKont · Chatium — нод-редактор сцен с AI-генерацией (картинки/видео/голос/SFX/музыка/текст)",
   "main": "main.js",
   "bin": {

package/renderer/board.js

@@ -1211,7 +1211,7 @@ $('newLocation').addEventListener('click', async () => {
   vlog('info', 'newLocation click; hasFilm=' + !!state.filmHandle);
   if (!state.filmHandle) { alert('Сначала открой проект (папку).'); return; }
   try {
-    const name = await askName('Название локации:', 'например, Кухня');
+    const name = await askName('Название (общее):', 'например, Кухня, Револьвер, Фон…');
     vlog('info', 'newLocation name=' + JSON.stringify(name));
     if (!name) return;
     const root = await state.filmHandle.getDirectoryHandle(LOC_DIR, { create: true });
@@ -1778,7 +1778,7 @@ function showNodeContextMenu(node, clientX, clientY) {
   // Локация: пометить картинку как location sheet
   if (node.type === 'image' && node.file && state.currentBoard?.kind === 'location') {
     const isSheet = state.currentBoard.metadata.location?.sheet === node.file;
-    add(isSheet ? '⭐ Это sheet локации' : '⭐ Сделать sheet локации', () => {
+    add(isSheet ? '⭐ Это главная картинка' : '⭐ Сделать главной картинкой', () => {
       if (!state.currentBoard.metadata.location) state.currentBoard.metadata.location = {};
       state.currentBoard.metadata.location.sheet = isSheet ? null : node.file;
       scheduleSave();

package/renderer/generate.js

@@ -104,6 +104,7 @@ function openPhraseFor(charInfo) {
   $('imageModelRow').style.display = 'none';
 
   $('imageOptionsRow').style.display = 'none';
+  $('imageQualityRow').style.display = 'none';
   $('videoOptionsRow').style.display = 'none';
 
   $('videoModelRow').style.display = 'none';
@@ -301,6 +302,7 @@ async function openGenModal(kind) {
   $('imageModelRow').style.display = kind === 'image' ? '' : 'none';
 
   $('imageOptionsRow').style.display = kind === 'image' ? '' : 'none';
+  $('imageQualityRow').style.display = kind === 'image' ? '' : 'none';
   $('videoOptionsRow').style.display = kind === 'video' ? '' : 'none';
 
   $('videoModelRow').style.display = kind === 'video' ? '' : 'none';
@@ -742,6 +744,7 @@ document.querySelectorAll('#genModal [data-kind]').forEach(b => {
     $('imageModelRow').style.display = state.genKind === 'image' ? '' : 'none';
 
     $('imageOptionsRow').style.display = state.genKind === 'image' ? '' : 'none';
+    $('imageQualityRow').style.display = state.genKind === 'image' ? '' : 'none';
     $('videoOptionsRow').style.display = state.genKind === 'video' ? '' : 'none';
 
     $('videoModelRow').style.display = state.genKind === 'video' ? '' : 'none';
@@ -1161,8 +1164,30 @@ document.querySelectorAll('#genModal [data-img-model]').forEach(b => {
     document.querySelectorAll('#genModal [data-img-model]').forEach(x => x.classList.remove('active'));
     b.classList.add('active');
     state.imageModel = b.dataset.imgModel;
+    localStorage.setItem('imageModel', state.imageModel);
   });
 });
+// При первом открытии: подсветить активную из state (а не первую в DOM).
+function syncImageModelActive() {
+  document.querySelectorAll('#genModal [data-img-model]').forEach(b =>
+    b.classList.toggle('active', b.dataset.imgModel === state.imageModel));
+}
+syncImageModelActive();
+// Переключатель качества (low / medium / high) — пишется в каждый запрос
+// генерации картинки (см. submit handler).
+document.querySelectorAll('#genModal [data-img-quality]').forEach(b => {
+  b.addEventListener('click', () => {
+    document.querySelectorAll('#genModal [data-img-quality]').forEach(x => x.classList.remove('active'));
+    b.classList.add('active');
+    state.imageQuality = b.dataset.imgQuality;
+    localStorage.setItem('imageQuality', state.imageQuality);
+  });
+});
+function syncImageQualityActive() {
+  document.querySelectorAll('#genModal [data-img-quality]').forEach(b =>
+    b.classList.toggle('active', b.dataset.imgQuality === state.imageQuality));
+}
+syncImageQualityActive();
 // Переключатель модели видео
 document.querySelectorAll('#genModal [data-vid-model]').forEach(b => {
   b.addEventListener('click', () => {
@@ -1499,6 +1524,7 @@ $('genSubmit').addEventListener('click', async () => {
             'seedream': 'seedream/4.5-text-to-image',
             'seedream-5-lite': 'seedream/5-lite-text-to-image',
             'nano-banana-2': 'nano-banana-2',
+            'nano-banana-pro': 'nano-banana-pro',
           }[state.imageModel] || 'nano-banana-2')
         : ({
             'seedance-2':       'bytedance/seedance-2',
@@ -1518,6 +1544,7 @@ $('genSubmit').addEventListener('click', async () => {
       } : {}),
       ...(kind === 'image' ? {
         aspectRatio: resolvedImageAspect,
+        quality: state.imageQuality,
       } : {}),
     },
   };
@@ -1678,6 +1705,8 @@ async function startGenerationJob(node, kind, prompt, mediaRefs, boardHandle, bK
       // Grok-imagine требует aspect_ratio из {2:3, 3:2, 1:1, 9:16, 16:9}.
       // Остальные модели (nano-banana-2, seedream и др.) тоже принимают.
       submitBody.aspectRatio = node.generated?.aspectRatio ?? boardAspect ?? state.imageAspect;
+      const q = node.generated?.quality ?? state.imageQuality;
+      if (q) submitBody.quality = q;
     }
     logJob(node.id, `POST /api/generate body: ${logSafe(submitBody)}`);
     logJob(node.id, `POST /api/generate (image_input=${imageInputs.length}, video_input=${videoInputs.length}, model=${modelKey})`);

package/renderer/media.js

@@ -1299,8 +1299,8 @@ function updateMentionPopup() {
       t.className = `mtype ${s.type}`;
       t.textContent = s.scope === 'char' ? 'персонаж'
                     : s.scope === 'char-image' ? `персонаж·${s.charName}`
-                    : s.scope === 'loc' ? 'локация'
-                    : s.scope === 'loc-image' ? `локация·${s.locName}`
+                    : s.scope === 'loc' ? 'общее'
+                    : s.scope === 'loc-image' ? `общее·${s.locName}`
                     : s.scope === 'scene-folder' ? 'сцена'
                     : s.type;
       const nm = document.createElement('span');

package/renderer/state.js

@@ -397,7 +397,8 @@ const state = {
   filmHandle: null,
   currentBoard: null,   // { kind, name, key, handle, metadata, urls }
   genKind: 'image',
-  imageModel: 'nano-banana-2',  // 'nano-banana-2' | 'grok' | ...
+  imageModel: localStorage.getItem('imageModel') || 'nano-banana-2',  // 'nano-banana-2' | 'nano-banana-pro' | 'grok' | ...
+  imageQuality: localStorage.getItem('imageQuality') || 'medium',  // low | medium | high
   imageAspect: localStorage.getItem('imageAspect') || '1:1',  // 1:1 / 16:9 / 9:16 / 3:2 / 2:3 / 4:3 / 3:4
   videoModel: localStorage.getItem('videoModel') || 'seedance-2',  // 'seedance-2' | 'kling-o1' | 'kling-3.0' | ...
   ttsModel: localStorage.getItem('ttsModel') || 'qwen/qwen3-tts',  // qwen/elevenlabs/v3/minimax/speech-02-hd/gemini

package/server.js

@@ -91,11 +91,11 @@ function sendError(res, e, defaultStatus = 500, providerHeader = null) {
 
 async function handleGenerate(req, res) {
   const body = await readJson(req);
-  const { kind, prompt, imageInputs, videoInputs, aspectRatio, resolution, duration, model: modelKey } = body;
+  const { kind, prompt, imageInputs, videoInputs, aspectRatio, resolution, duration, quality, model: modelKey } = body;
   if (!prompt || !prompt.trim()) return send(res, 400, { error: 'prompt обязателен' });
   try {
     const r = await providers.startGeneration({
-      kind, prompt, modelKey, imageInputs, videoInputs, aspectRatio, resolution, duration,
+      kind, prompt, modelKey, imageInputs, videoInputs, aspectRatio, resolution, duration, quality,
       settings: getSettings(),
     });
     send(res, 200, { taskId: r.taskId }, { 'X-Provider': r.provider });