From 30aec950cdcefe01c1dc7e61df8fef2b3ba2e1bb Mon Sep 17 00:00:00 2001
From: digital-garbage <133010426+digital-garbage@users.noreply.github.com>
Date: Sun, 7 Jun 2026 00:35:43 +0300
Subject: [PATCH] Movie Editor inspector: expose conditioning/sampler selectors
 + settings inline

The conditioning and sampler slot pickers were in the Generate menu (a
window.prompt popup) with no visual path to the settings panels in the
inspector. Users found the menu selectors but never saw the Studio sampler
algorithm controls or the Chain Sampler knobs.

Fix: add conditioning and sampler section headers with inline <select> slot
pickers directly in the project inspector, immediately above their respective
settings panels. Changing the dropdown instantly shows or hides the panel for
that choice. The menubar items remain as shortcuts.

Also wrap SamplerPanel.render() in try/catch so a JS failure shows a visible
error message instead of silently aborting the rest of the inspector render.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 movie_editor/frontend/inspector.js | 39 ++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/movie_editor/frontend/inspector.js b/movie_editor/frontend/inspector.js
index 2e270c5f..919dbb98 100644
--- a/movie_editor/frontend/inspector.js
+++ b/movie_editor/frontend/inspector.js
@@ -138,12 +138,25 @@
     neg.oninput = () => S.patchProjectQuiet({ negative_prompt: neg.value });
     body.append(field("Negative prompt", neg));
 
-    if (!p.conditioning_slot || p.conditioning_slot === "funpack") {
-      renderStudioSettings(st);
-    }
-    if (!p.sampler_slot || p.sampler_slot === "funpack") {
-      renderSamplerSettings(st);
-    }
+    const slots = (st.models?.slots || []);
+
+    // Conditioning slot selector + its settings panel
+    const condTag = el("div", "insp-tag"); condTag.textContent = "Conditioning"; body.append(condTag);
+    const condSel = el("select");
+    [["funpack", "FunPack Studio (built-in)"], ...slots.map((s) => [s.id, s.label || s.node_class || s.id])]
+      .forEach(([v, lbl]) => { const o = new Option(lbl, v); if ((p.conditioning_slot || "funpack") === v) o.selected = true; condSel.append(o); });
+    condSel.onchange = () => S.setConditioningSlot(condSel.value);
+    body.append(field("Node", condSel));
+    if (!p.conditioning_slot || p.conditioning_slot === "funpack") renderStudioSettings(st);
+
+    // Sampler slot selector + its settings panel
+    const sampTag = el("div", "insp-tag"); sampTag.textContent = "Sampler"; body.append(sampTag);
+    const sampSel = el("select");
+    [["funpack", "FunPack Chain Sampler (built-in)"], ...slots.map((s) => [s.id, s.label || s.node_class || s.id])]
+      .forEach(([v, lbl]) => { const o = new Option(lbl, v); if ((p.sampler_slot || "funpack") === v) o.selected = true; sampSel.append(o); });
+    sampSel.onchange = () => S.setSamplerSlot(sampSel.value);
+    body.append(field("Node", sampSel));
+    if (!p.sampler_slot || p.sampler_slot === "funpack") renderSamplerSettings(st);
   }
 
   function renderStudioSettings(st) {
@@ -153,7 +166,7 @@
     try { curSettings = JSON.parse(si.studio_settings || "{}"); } catch (_) {}
     const samplers = curSettings.samplers || null;
 
-    const tag = el("div", "insp-tag"); tag.textContent = "Studio sampler"; body.append(tag);
+    const tag = el("div", "insp-tag sp-sub"); tag.textContent = "Studio · sampler algorithm"; body.append(tag);
 
     function persist(updatedSamplers, quiet) {
       const next = JSON.stringify({ ...curSettings, samplers: updatedSamplers });
@@ -161,9 +174,15 @@
       else S.setStudioInputNow("studio_settings", next);
     }
 
-    window.SamplerPanel.render(body, samplers,
-      (s) => persist(s, true),
-      (s) => persist(s, false));
+    try {
+      window.SamplerPanel.render(body, samplers,
+        (s) => persist(s, true),
+        (s) => persist(s, false));
+    } catch (e) {
+      const err = el("div", "insp-hint"); err.style.color = "var(--err,#e55)";
+      err.textContent = "Studio sampler panel failed to render: " + e.message;
+      body.append(err);
+    }
   }
 
   // Key ChainSampler widget inputs exposed as simple form controls.