AI media harness for planning, generating, and editing locally
TypeScript
Expose per-model CFG for MOSS images
Bittib0e7684c4a7f
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.mdindex 1b35528..cd63d88 100644--- a/RELEASE_NOTES.md+++ b/RELEASE_NOTES.md@@ -6,6 +6,7 @@ This alpha update adds Prompt video scenes, agent image drafts, Sol attention an- **Generation effects.** Add LCS color steering, tone, sharpness and color stabilization from the video Scene or image root inspector. Effects run during generation, with bypass, reset, step ranges and optional regions. VAE calibration is automatic, cached and cancellable. MOSS disables these controls through the shared model capabilities.+- **MOSS CFG control.** Set CFG before Seed in the image inspector, with a default of 3. Values are remembered per model in each image draft and carried into local and LAN generation. H3 hides the control.- **MOSS image generation.** Generator settings group templates by model and include MOSS Image with its model weights and tokenizer downloads. MOSS is available for new images on CUDA; video, image editing, Zoom, and reference-based character sheets are disabled through shared model capabilities.- **Prompt video scenes.** New ordinary video scenes default to Prompt, with text and reference guidance but no start- or last-frame selectors. First & last frame remains available for frame conditioning.- **Agent image drafts and generation.** Ask the agent to prepare multiple images in the image bar for later, edit a selected draft, or generate it with a chosen generator. Preparation is saved before rendering, and the agent resumes after generation with the saved result.@@ -25,4 +26,4 @@ This alpha update adds Prompt video scenes, agent image drafts, Sol attention an- Backdrop prompts describe a flat, constant color field in every shot, limit reference guidance to subject appearance, and use neutral studio styling when no look is specified.- Scene type label tooltips now explain each scene type's behavior.- Renamed Add reference to Reference browser and centered the agent send and stop buttons.-- Updated the bundled Windows and Linux SlopFab runtimes to API 1.31 for MOSS, native LCS and earlier Zoom fixes. LAN worker protocol 10 carries generation effects; update workers alongside the app.+- Updated the bundled Windows and Linux SlopFab runtimes to API 1.31 for MOSS, native LCS and earlier Zoom fixes. LAN worker protocol 11 carries generation effects and image CFG; update workers alongside the app.diff --git a/docs/slopfab-compatibility.md b/docs/slopfab-compatibility.mdindex b8126d2..9973617 100644--- a/docs/slopfab-compatibility.md+++ b/docs/slopfab-compatibility.md@@ -24,7 +24,7 @@ parameters. Corrupt archives are regenerated. Planning never calibrates orruns inference. The generation request snapshots the archive before sampling;region masks use fractional coverage of the resolved latent patch grid.-LAN worker protocol 10 carries the portable controls and prevents older+LAN worker protocol 11 carries the portable controls and prevents olderworkers from silently dropping them. Each worker calibrates and caches itsown VAE. Update workers alongside the desktop app. A runtime missing the LCSexports reports an explicit upgrade error.@@ -45,6 +45,20 @@ MOSS uses CUDA/Flash attention, the image VAE slot, and a separate Qwen3.5tokenizer file. It returns one RGB frame through the existing image save path.Older workers report an explicit runtime-upgrade error for MOSS requests.+The shared model catalog declares CFG support and its default per model+(`cfg: null` for H3, `cfg: { "default": 3 }` for MOSS). The image inspector+shows CFG before Seed only for supported models. Image drafts and snapshots+store separate values in `cfgScales`, keyed by model ID; switching models+preserves these values. The queued request carries the selected `guidanceScale`,+including an explicitly captured default. Native validation rejects unsupported+models, negative/non-finite values and values outside the float32 range.++Slopus calls API 1.30's `slopfab_request_set_image_guidance` for planning and+generation, preserving MOSS's empty negative prompt and skip layer 22. CFG 1+uses only the positive branch. Worker protocol 11 prevents an older worker+from ignoring CFG. Tests verify the value in the bundled runtime's plan,+project persistence, queue isolation and saved output settings.+No full MOSS inference with model weights was run for this integration.## Zoom boundary correction (1.28.2)diff --git a/src-tauri/core/src/models.rs b/src-tauri/core/src/models.rsindex 9310497..0ae8ee1 100644--- a/src-tauri/core/src/models.rs+++ b/src-tauri/core/src/models.rs@@ -12,6 +12,16 @@ pub struct GeneratorFeatures {pub loras: bool,pub motion_cache: bool,pub generation_effects: bool,+ pub cfg: Option<CfgSettings>,+}++#[derive(Debug, serde::Deserialize)]+pub struct CfgSettings {+ pub default: f32,+}++pub fn validate_cfg_scale(value: f64) -> Result<(), String> {+ if !value.is_finite() || value < 0.0 || value > f32::MAX as f64 { Err("CFG must be a finite, non-negative number within the runtime range.".into()) } else { Ok(()) }}pub fn generator_features(model_type: &str) -> &'static GeneratorFeatures {diff --git a/src-tauri/core/src/slopfab/config.rs b/src-tauri/core/src/slopfab/config.rsindex 93c4ba2..3b5c7be 100644--- a/src-tauri/core/src/slopfab/config.rs+++ b/src-tauri/core/src/slopfab/config.rs@@ -122,6 +122,10 @@ impl Configuration {pub(super) fn validate_inputs(&self, request: &GenerationRequest) -> Result<(), String> {let features = crate::models::generator_features(&self.model_type);+ if let Some(scale) = request.guidance_scale {+ crate::models::validate_cfg_scale(f64::from(scale))?;+ if features.cfg.is_none() || !request.still_image { return Err(format!("{} does not support configurable CFG for this generation.", features.label)); }+ }if let Some(effects) = &request.generation_effects {if effects.native_settings()?.is_some() && !features.generation_effects { return Err(format!("{} does not support generation effects.", features.label)); }}diff --git a/src-tauri/core/src/slopfab/ffi/mod.rs b/src-tauri/core/src/slopfab/ffi/mod.rsindex 7d02cc3..12b7ba6 100644--- a/src-tauri/core/src/slopfab/ffi/mod.rs+++ b/src-tauri/core/src/slopfab/ffi/mod.rs@@ -221,6 +221,14 @@ impl Api {self.check(r)?;self.inner.set_model(r.pointer.as_ptr(), id, path)}+ #[cfg(test)]+ pub fn disable_image_guidance_for_test(&mut self) {+ Arc::get_mut(&mut self.inner).expect("configure API before creating handles").disable_image_guidance_for_test();+ }+ pub fn set_image_guidance(&self, r: &RequestHandle, scale: f32) -> Result<(), String> {+ self.check(r)?;+ self.inner.set_image_guidance(r.pointer.as_ptr(), scale)+ }pub fn set_model_family(&self, r: &RequestHandle, family: &str) -> Result<(), String> {self.check(r)?;self.inner.set_model_family(r.pointer.as_ptr(), family)diff --git a/src-tauri/core/src/slopfab/ffi/raw/mod.rs b/src-tauri/core/src/slopfab/ffi/raw/mod.rsindex f114067..5266b41 100644--- a/src-tauri/core/src/slopfab/ffi/raw/mod.rs+++ b/src-tauri/core/src/slopfab/ffi/raw/mod.rs@@ -77,7 +77,10 @@ type SetImageEditPath = unsafe extern "C" fn(*mut Request, *const c_char, i32, itype SetImageEditRgb = unsafe extern "C" fn(*mut Request, *const u8, usize, i32, i32, usize, i32, i32, i32, i32, f32, i32) -> i32;type ExportRefmod = unsafe extern "C" fn(*const Request, *const c_char, *const c_char, *const c_char, i32) -> i32;+type SetImageGuidance = unsafe extern "C" fn(*mut Request, f32, *const c_char, *const i32, i32) -> i32;+pub struct Api {+ set_image_guidance: Option<SetImageGuidance>,_library: Library,capi_version: unsafe extern "C" fn() -> u32,version_string: unsafe extern "C" fn() -> *const c_char,@@ -241,6 +244,7 @@ impl Api {"slopfab_request_set_seed",unsafe extern "C" fn(*mut Request, u64) -> i32),+ set_image_guidance: library.get::<SetImageGuidance>(b"slopfab_request_set_image_guidance\0").ok().map(|symbol| *symbol),set_model_family: library.get::<unsafe extern "C" fn(*mut Request, *const c_char) -> i32>(b"slopfab_request_set_model_family\0").ok().map(|symbol| *symbol),@@ -577,6 +581,15 @@ impl Api {let v = path_cstring(path)?;self.error(unsafe { (self.set_model)(r, id, v.as_ptr()) })}+ #[cfg(test)]+ pub fn disable_image_guidance_for_test(&mut self) { self.set_image_guidance = None; }+ pub fn set_image_guidance(&self, r: *mut Request, scale: f32) -> Result<(), String> {+ let set = self.set_image_guidance.ok_or("Configurable CFG requires SlopFab API 1.30 or newer. Update the runtime on the machine running generation.")?;+ // Keep MOSS's default empty negative prompt and negative-branch skip layer.+ let negative = CString::new("").unwrap();+ let skip_layers = [22_i32];+ self.error(unsafe { set(r, scale, negative.as_ptr(), skip_layers.as_ptr(), 1) })+ }pub fn set_model_family(&self, r: *mut Request, family: &str) -> Result<(), String> {let set = self.set_model_family.ok_or("MOSS requires SlopFab API 1.30 or newer. Update the runtime on the machine running generation.")?;let value = CString::new(family).map_err(|_| "Invalid model family.")?;diff --git a/src-tauri/core/src/slopfab/ffi/tests.rs b/src-tauri/core/src/slopfab/ffi/tests.rsindex 35e0c03..ac9f461 100644--- a/src-tauri/core/src/slopfab/ffi/tests.rs+++ b/src-tauri/core/src/slopfab/ffi/tests.rs@@ -123,3 +123,14 @@ fn older_runtimes_reject_latent_upscale_but_allow_normal_generation() {api.set_resolution(&request, 64, 32).unwrap();assert!(api.resolve(&request).is_ok());}++#[test]+fn older_runtimes_reject_cfg_and_cross_instance_guidance_is_refused() {+ let path = Path::new(env!("CARGO_MANIFEST_DIR")).join("../../lib/slopfab").join(crate::slopfab::DLL_FILE_NAME);+ let mut api = Api::load(&path).unwrap();+ api.disable_image_guidance_for_test();+ let request = RequestHandle::new(&api).unwrap();+ assert!(api.set_image_guidance(&request, 3.0).unwrap_err().contains("API 1.30"));+ let other = Api::load(&path).unwrap();+ assert!(other.set_image_guidance(&request, 3.0).unwrap_err().contains("different runtime"));+}diff --git a/src-tauri/core/src/slopfab/h3.rs b/src-tauri/core/src/slopfab/h3.rsindex 241caa3..7d78bb8 100644--- a/src-tauri/core/src/slopfab/h3.rs+++ b/src-tauri/core/src/slopfab/h3.rs@@ -73,6 +73,9 @@ pub(super) fn configure_request(}// Sampling presets replace overrides, so apply the audio setting afterward.api.set_audio_steps(handle, request.audio_steps.unwrap_or(0))?;+ if let Some(cfg) = &crate::models::generator_features(&configuration.model_type).cfg {+ api.set_image_guidance(handle, request.guidance_scale.unwrap_or(cfg.default))?;+ }api.set_seed(handle, generation_seed(request.seed)?)?;if let Some(edit) = &request.image_edit {let step = edit.edits.first().ok_or("Add an image edit before generating.")?;diff --git a/src-tauri/core/src/slopfab/planning.rs b/src-tauri/core/src/slopfab/planning.rsindex e654856..54ddacd 100644--- a/src-tauri/core/src/slopfab/planning.rs+++ b/src-tauri/core/src/slopfab/planning.rs@@ -57,6 +57,7 @@ pub fn resolve_plan(}pub(super) fn validate_generation_controls(request: &GenerationRequest) -> Result<(), String> {+ if let Some(scale) = request.guidance_scale { crate::models::validate_cfg_scale(f64::from(scale))?; }if let Some(effects) = &request.generation_effects { effects.validate()?; }super::continuation::validate(request)?;if let Some(bridge) = &request.latent_bridge {diff --git a/src-tauri/core/src/slopfab/tests.rs b/src-tauri/core/src/slopfab/tests.rsindex f39ccdd..520f866 100644--- a/src-tauri/core/src/slopfab/tests.rs+++ b/src-tauri/core/src/slopfab/tests.rs@@ -1530,3 +1530,26 @@ fn sigma_provider_settings_validate_float32_bounds() {}}}++#[test]+fn moss_cfg_reaches_planning_and_generation_and_h3_rejects_it() {+ let api = ffi::Api::load(&std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../lib/slopfab").join(super::DLL_FILE_NAME)).unwrap();+ let mut config = Configuration::from_settings(&BTreeMap::new());+ config.model_type = "moss".into();+ config.attention = "flash2";+ let mut request = GenerationRequest { still_image: true, frames: 1, steps: 50, prompt: "Apple".into(), canvas_width: 512, canvas_height: 512, ..Default::default() };+ for purpose in [RequestPurpose::Plan, RequestPurpose::Generate] {+ for (scale, expected) in [(None, "3"), (Some(0.0), "0"), (Some(1.0), "1"), (Some(4.5), "4.5")] {+ request.guidance_scale = scale;+ let handle = RequestHandle::new(&api).unwrap();+ configure_request(&api, &handle, &request, &config, ComputePlatform::Cuda13, purpose, &ReferenceVideos::default()).unwrap();+ assert!(api.describe(&handle).unwrap().contains(&format!("guidance {expected}\n")));+ }+ }+ for scale in [-1.0, f32::NAN, f32::INFINITY] {+ request.guidance_scale = Some(scale);+ assert!(config.validate_inputs(&request).is_err());+ }+ config.model_type = "minimax-h3".into(); request.guidance_scale = Some(3.0);+ assert!(config.validate_inputs(&request).unwrap_err().contains("CFG"));+}diff --git a/src-tauri/core/src/slopfab/types.rs b/src-tauri/core/src/slopfab/types.rsindex 7bf9aaa..cd628de 100644--- a/src-tauri/core/src/slopfab/types.rs+++ b/src-tauri/core/src/slopfab/types.rs@@ -54,6 +54,8 @@ pub struct LatentBridgeRequest {#[derive(Debug, Clone, Default, Deserialize, Serialize)]#[serde(rename_all = "camelCase")]pub struct GenerationRequest {+ #[serde(default, skip_serializing_if = "Option::is_none")]+ pub guidance_scale: Option<f32>,#[serde(default, skip_serializing_if = "Option::is_none")]pub generation_effects: Option<crate::generation_effects::GenerationEffects>,pub job_id: String,diff --git a/src-tauri/core/src/worker/protocol.rs b/src-tauri/core/src/worker/protocol.rsindex ac3b0ca..90dec28 100644--- a/src-tauri/core/src/worker/protocol.rs+++ b/src-tauri/core/src/worker/protocol.rs@@ -9,6 +9,7 @@ use std::collections::BTreeMap;pub const SERVICE_TYPE: &str = "_slopus-worker._tcp.local.";/// Bumped on any incompatible change to the routes or bodies below.+// v11 carries image CFG; older workers would silently discard the scale.// v10 carries generation effects; older workers would silently discard them.// v8 carries latent upscaling and its model weights.// v9 carries retained latent bridges and both anchor archives.@@ -16,7 +17,7 @@ pub const SERVICE_TYPE: &str = "_slopus-worker._tcp.local.";// v6 added custom upscale weights.// v5 added overlap locking.// v4 added SeedVR2 export streams. v3 added inverted image masks.-pub const PROTOCOL_VERSION: u32 = 10;+pub const PROTOCOL_VERSION: u32 = 11;/// Streaming SeedVR2 restoration; model paths are resolved on the worker.#[derive(Debug, Clone, Serialize, Deserialize)]@@ -315,11 +316,12 @@ mod tests {#[test]fn generation_effects_roundtrip_without_machine_specific_paths() {let effects = serde_json::from_str(include_str!("../../../../fixtures/generation-effects.json")).unwrap();- let mut request = GenerationRequest { generation_effects: Some(effects), ..Default::default() };+ let mut request = GenerationRequest { generation_effects: Some(effects), guidance_scale: Some(4.5), ..Default::default() };let mut settings = settings(&[]);visit_paths(&mut request, &mut settings, |_, _| panic!("Effects must not transfer calibration files")).unwrap();let restored: GenerationRequest = serde_json::from_slice(&serde_json::to_vec(&request).unwrap()).unwrap();assert_eq!(restored.generation_effects, request.generation_effects);+ assert_eq!(restored.guidance_scale, Some(4.5));}#[test]diff --git a/src-tauri/src/project/commands/images.rs b/src-tauri/src/project/commands/images.rsindex 66d084e..b01f69f 100644--- a/src-tauri/src/project/commands/images.rs+++ b/src-tauri/src/project/commands/images.rs@@ -24,6 +24,7 @@ pub struct ImageStylePatch {pub(super) fn new_scene(prompt: &str) -> ImageScene {ImageScene {generation_effects: None,+ cfg_scales: None,root_type: None,source_image: None,output_size: None,@@ -152,7 +153,8 @@ pub(super) fn apply(reference_ids,} => {scene = ImageScene {- generation_effects: scene.generation_effects,+ generation_effects: scene.generation_effects,+ cfg_scales: scene.cfg_scales,root_type: scene.root_type,source_image: scene.source_image,output_size: scene.output_size,diff --git a/src-tauri/src/project/image.rs b/src-tauri/src/project/image.rsindex 7ba4f72..1fee944 100644--- a/src-tauri/src/project/image.rs+++ b/src-tauri/src/project/image.rs@@ -65,6 +65,8 @@ impl ImageTemplateSnapshot {#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]#[serde(rename_all = "camelCase", deny_unknown_fields)]pub struct ImageScene {+ #[serde(default, skip_serializing_if = "Option::is_none")]+ pub cfg_scales: Option<std::collections::BTreeMap<String, f64>>,#[serde(default, skip_serializing_if = "Option::is_none")]pub generation_effects: Option<slopus_core::generation_effects::GenerationEffects>,#[serde(default, skip_serializing_if = "Option::is_none")]@@ -143,6 +145,12 @@ impl ImageScene {}pub fn validate(&self) -> Result<(), String> {+ if let Some(scales) = &self.cfg_scales {+ for (model, scale) in scales {+ if model.is_empty() { return Err("CFG settings require a model ID.".into()); }+ slopus_core::models::validate_cfg_scale(*scale)?;+ }+ }if let Some(effects) = &self.generation_effects { effects.validate()?; }if self.output_size.as_ref().is_some_and(|size| [size.width, size.height].iter().any(|value|!(32..=8192).contains(value) || value % 32 != 0)) {diff --git a/src-tauri/src/tests/images.rs b/src-tauri/src/tests/images.rsindex 645d448..efd8751 100644--- a/src-tauri/src/tests/images.rs+++ b/src-tauri/src/tests/images.rs@@ -77,6 +77,7 @@ fn image_root_survives_save_and_agent_hierarchy_replacement() {let mut config = image_fixture();let scene = config.image_scene.as_mut().unwrap();scene.style.mode = "none".into();+ scene.cfg_scales = Some(std::collections::BTreeMap::from([("moss".into(), 4.5), ("future-model".into(), 2.0)]));scene.generation_effects = Some(serde_json::from_str(include_str!("../../../fixtures/generation-effects.json")).unwrap());scene.root_type = Some("image".into());scene.source_image = Some(crate::project::image::ImageSource { relative_path: "media/imported/source.png".into(), name: "Source".into(), width: 65, height: 41 });@@ -86,7 +87,7 @@ fn image_root_survives_save_and_agent_hierarchy_replacement() {let reopened = read_project(Path::new(&created.folder_path)).unwrap();assert_eq!(reopened.config.image_scene, config.image_scene);let mut command = serde_json::to_value(config.image_scene.as_ref().unwrap()).unwrap();- for field in ["rootType", "sourceImage", "outputAssetId", "outputSize", "generationEffects"] { command.as_object_mut().unwrap().remove(field); }+ for field in ["rootType", "sourceImage", "outputAssetId", "outputSize", "generationEffects", "cfgScales"] { command.as_object_mut().unwrap().remove(field); }command["op"] = serde_json::json!("image.set");let parsed: ProjectCommand = serde_json::from_value(command).unwrap();let changed = execute_commands_at(&config, &[parsed], &config.updated_at).unwrap();@@ -504,3 +505,12 @@ fn image_node_patches_distinguish_missing_and_null_and_initialize_older_image_pr);assert_eq!(initialized.image_scene.as_ref().unwrap().nodes.len(), 2);}++#[test]+fn image_cfg_rejects_invalid_values() {+ for scale in [-1.0, f64::NAN, f64::INFINITY, f64::MAX] {+ let mut config = image_fixture();+ config.image_scene.as_mut().unwrap().cfg_scales = Some(std::collections::BTreeMap::from([("moss".into(), scale)]));+ assert!(validate_and_normalize_config(config).is_err());+ }+}diff --git a/src/components/workspace/ImageEditor.test.tsx b/src/components/workspace/ImageEditor.test.tsxindex bfa481d..5a3c4ac 100644--- a/src/components/workspace/ImageEditor.test.tsx+++ b/src/components/workspace/ImageEditor.test.tsx@@ -1043,3 +1043,27 @@ it("saves generation effects from the image root inspector and blocks them on MOexpect(screen.getByRole("button", { name: "Generate" })).toBeDisabled();expect(screen.getByRole("checkbox", { name: "Enable Tone" })).toBeEnabled();});++it("shows CFG before Seed for MOSS and preserves its value when switching models", () => {+ const paths = { transformer: "model", textEncoder: "encoder", videoVae: "vae", tokenizer: "tokenizer.json", audioVae: "audio" };+ const moss = { ...mossImageTemplate(), sources: {}, paths };+ const h3 = { ...createGeneratorTemplate("H3"), sources: {}, paths };+ saveGeneratorTemplateSettings({ templates: [moss, h3], defaultTemplateId: moss.id, catalogVersion: 10 });+ const initial = parseProjectConfig(fixture);+ initial.imageScene = createImageScene("An apple");+ const latest = setup(initial);+ const cfg = screen.getByRole("spinbutton", { name: "CFG" });+ expect(cfg).toHaveValue(3);+ expect(cfg.compareDocumentPosition(screen.getByRole("spinbutton", { name: "Seed" })) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy();+ fireEvent.change(cfg, { target: { value: "4.5" } });+ expect(latest().imageScene?.cfgScales).toEqual({ moss: 4.5 });+ fireEvent.change(cfg, { target: { value: "-1" } });+ expect(latest().imageScene?.cfgScales?.moss).toBe(4.5);+ choose("Generator", "H3");+ expect(screen.queryByRole("spinbutton", { name: "CFG" })).toBeNull();+ choose("Generator", "MOSS Image");+ expect(screen.getByRole("spinbutton", { name: "CFG" })).toHaveValue(4.5);+ const saved = parseProjectConfig(JSON.parse(JSON.stringify(latest())));+ cleanup(); setup(saved);+ expect(screen.getByRole("spinbutton", { name: "CFG" })).toHaveValue(4.5);+});diff --git a/src/components/workspace/ImageEditor.tsx b/src/components/workspace/ImageEditor.tsxindex ac95783..b6dc605 100644--- a/src/components/workspace/ImageEditor.tsx+++ b/src/components/workspace/ImageEditor.tsx@@ -745,6 +745,12 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene{!imageRoot && <div className="image-inspector__area"><span id={rootField("background-label")}>Background (environment)</span><PromptTextField aria-labelledby={rootField("background-label")} rows={3} value={scene.background} references={promptReferences} missingLabel={missingReference} onChange={(background) => commit({ ...scene, background })} /></div>}<PropSection title="Image generation" persistKey="image.generation" summary={`${generationStepsForTemplate(scene.steps, template)} steps`}><PropRow label="Steps" htmlFor={rootField("steps")}><input id={rootField("steps")} className="text-field" type="number" min="2" max="1000" value={scene.steps} onChange={(event) => { const value = Number(event.target.value); if (Number.isInteger(value) && value >= 2 && value <= 1000) commit({ ...scene, steps: value }); }} /></PropRow>+ {model.cfg && template && <PropRow label="CFG" htmlFor={rootField("cfg")} tooltip="Classifier-free guidance. 1 uses only the positive prompt; higher values strengthen guidance." value={scene.cfgScales?.[template.modelType] ?? model.cfg.default} defaultValue={model.cfg.default} onReset={active ? undefined : () => commit({ ...scene, cfgScales: { ...scene.cfgScales, [template.modelType]: model.cfg!.default } })}>+ <input id={rootField("cfg")} className="text-field" type="number" min="0" max={3.4028234663852886e38} step="0.1" disabled={active} value={scene.cfgScales?.[template.modelType] ?? model.cfg.default} onChange={(event) => {+ const value = event.target.valueAsNumber;+ if (Number.isFinite(value) && value >= 0 && value <= 3.4028234663852886e38) commit({ ...scene, cfgScales: { ...scene.cfgScales, [template.modelType]: value } });+ }} />+ </PropRow>}<PropRow label="Seed" htmlFor={rootField("seed")} tooltip="-1 picks a random seed"><input id={rootField("seed")} className="text-field" type="number" min="-1" max={Number.MAX_SAFE_INTEGER} value={scene.seed} onChange={(event) => { const value = Number(event.target.value); if (Number.isSafeInteger(value) && value >= -1) commit({ ...scene, seed: value }); }} /></PropRow>{generatedImage && <UsedImageSeed id={rootField("used-seed")} seed={usedSeed} onError={setError} />}{!imageRoot && <PropRow label="Aspect ratio" htmlFor={rootField("ratio")}><ComboBox id={rootField("ratio")} aria-label="Aspect ratio" value={settings.aspectRatio} options={["16:9", "9:16", "1:1", "4:5"].map((ratio) => ({ value: ratio, label: ratio }))} onChange={(value) => { const aspectRatio = value as ProjectConfig["settings"]["aspectRatio"]; onChange((current) => ({ ...current, imageSettings: { ...imageSettings(current), aspectRatio } })); }} /></PropRow>}diff --git a/src/lib/generatorModels.json b/src/lib/generatorModels.jsonindex 3fb3416..c8edb2a 100644--- a/src/lib/generatorModels.json+++ b/src/lib/generatorModels.json@@ -8,7 +8,8 @@"imageReferences": true,"loras": true,"motionCache": true,- "generationEffects": true+ "generationEffects": true,+ "cfg": null},"moss": {"label": "MOSS Image",@@ -19,6 +20,9 @@"imageReferences": false,"loras": false,"motionCache": false,- "generationEffects": false+ "generationEffects": false,+ "cfg": {+ "default": 3+ }}}diff --git a/src/lib/generatorModels.ts b/src/lib/generatorModels.tsindex 925a13b..66da619 100644--- a/src/lib/generatorModels.ts+++ b/src/lib/generatorModels.ts@@ -1,8 +1,14 @@import models from "./generatorModels.json";-export type GeneratorModel = typeof models["minimax-h3"];+export type GeneratorModel = (typeof models)[keyof typeof models];// Shared with native request validation; edit the JSON to enable capabilities.export const GENERATOR_MODELS = Object.entries(models).map(([value, model]) => ({ value, ...model }));export function generatorModel(modelType?: string): GeneratorModel {return models[modelType as keyof typeof models] ?? models["minimax-h3"];}++/** Keep authored CFG values per model; unsupported models never submit one. */+export function imageCfgScale(modelType: string, scales?: Record<string, number>): number | undefined {+ const cfg = generatorModel(modelType).cfg;+ return cfg ? scales?.[modelType] ?? cfg.default : undefined;+}diff --git a/src/lib/imageScene.ts b/src/lib/imageScene.tsindex d4febe4..6097b2d 100644--- a/src/lib/imageScene.ts+++ b/src/lib/imageScene.ts@@ -17,6 +17,7 @@ export const imageSourceSchema = z.object({export type ImageSource = z.infer<typeof imageSourceSchema>;export const imageSceneSchema = z.object({generationEffects: generationEffectsSchema.optional(),+ cfgScales: z.record(z.string().min(1), z.number().finite().min(0).max(3.4028234663852886e38)).optional(),rootType: z.enum(["prompt", "image"]).optional(),sourceImage: imageSourceSchema.nullish(),outputSize: z.object({ width: z.number().int().min(32).max(8192).multipleOf(32), height: z.number().int().min(32).max(8192).multipleOf(32) }).optional(),@@ -58,6 +59,7 @@ export function createImageScene(prompt = ""): ImageScene {}export function createImageEditScene(sourceImage: ImageSource | null, previous?: ImageScene): ImageScene {return { ...createImageScene(), rootType: "image", sourceImage,+ ...(previous?.cfgScales ? { cfgScales: { ...previous.cfgScales } } : {}),...(previous?.generationEffects ? { generationEffects: structuredClone(previous.generationEffects) } : {}),steps: previous?.steps ?? 20, seed: previous?.seed ?? -1, referenceIds: previous?.referenceIds ?? [] };}diff --git a/src/lib/runtime.ts b/src/lib/runtime.tsindex 474214c..74f2b7a 100644--- a/src/lib/runtime.ts+++ b/src/lib/runtime.ts@@ -105,6 +105,7 @@ export interface SlopfabGenerationRequest {imageEdit?: { sourceRelativePath: string; edits: import("./imageEditing").ImageEditStep[] };steps: number;audioSteps?: number;+ guidanceScale?: number;generationEffects?: import("./generationEffects").GenerationEffects;videoSigmaShift?: number;audioSigmaShift?: number;diff --git a/src/lib/workQueue.test.ts b/src/lib/workQueue.test.tsindex 0fa68a8..caf0607 100644--- a/src/lib/workQueue.test.ts+++ b/src/lib/workQueue.test.ts@@ -362,7 +362,8 @@ describe("image generation work", () => {queue.enqueueImage(session, moss);await waitFor(() => expect(enqueueSlopfabGeneration).toHaveBeenCalledOnce());const [request, config] = vi.mocked(enqueueSlopfabGeneration).mock.calls[0];- expect(request).toMatchObject({ stillImage: true, frames: 1, referencePaths: [] });+ expect(request).toMatchObject({ stillImage: true, frames: 1, referencePaths: [], guidanceScale: 3 });+ expect(config.imageScene?.cfgScales?.moss).toBe(3);expect(request.prompt).toContain("An ocean poster");expect(request.prompt).not.toContain("overall_soundscape");expect(config.providerSettings.slopfab.options).toMatchObject({ modelType: "moss", attention: "flash2", tokenizer: "tokenizer.json" });@@ -372,6 +373,24 @@ describe("image generation work", () => {expect(() => queue.enqueueImage(session, moss)).toThrow(/does not support image editing/);expect(() => queue.enqueueExtendImage(session, moss, "source", { bounds: { x: 0, y: 0, width: 512, height: 512 }, prompt: "", steps: 50, seed: 1 })).toThrow(/supports image editing/);});+ it("captures the selected model CFG for generation and image history", async () => {+ const { queue } = setup();+ const session = queue.project(imageProject());+ session.update((current) => ({ ...current, imageScene: { ...current.imageScene!, cfgScales: { moss: 4.5, "minimax-h3": 9 } } }));+ const moss = { ...mossImageTemplate(), sources: {}, paths: { transformer: "moss", textEncoder: "qwen", videoVae: "flux", tokenizer: "tokenizer.json", audioVae: "" } };+ vi.mocked(invoke).mockResolvedValue({ relativePath: "media/generated/moss.jpg", width: 768, height: 768 });+ queue.enqueueImage(session, moss);+ session.update((current) => ({ ...current, imageScene: { ...current.imageScene!, cfgScales: { moss: 7 } } }));+ await waitFor(() => expect(enqueueSlopfabGeneration).toHaveBeenCalledOnce());+ const request = vi.mocked(enqueueSlopfabGeneration).mock.calls[0][0];+ expect(request.guidanceScale).toBe(4.5);+ await finish(queue, request.jobId);+ const result = session.getSnapshot().config.assets.find((asset) => asset.relativePath === "media/generated/moss.jpg");+ expect(result?.imageGeneration?.scene.cfgScales?.moss).toBe(4.5);+ queue.enqueueImage(session, template);+ await waitFor(() => expect(enqueueSlopfabGeneration).toHaveBeenCalledTimes(2));+ expect(vi.mocked(enqueueSlopfabGeneration).mock.calls[1][0].guidanceScale).toBeUndefined();+ });it("captures image effects, shows calibration progress and refuses active effects on MOSS", async () => {const { queue } = setup();const session = queue.project(imageProject());diff --git a/src/lib/workQueue.ts b/src/lib/workQueue.tsindex 5aa2b23..ae9dcce 100644--- a/src/lib/workQueue.ts+++ b/src/lib/workQueue.ts@@ -1,3 +1,4 @@+import { imageCfgScale } from "./generatorModels";import { activeGenerationEffects } from "./generationEffects";import { imageSettings } from "./imageSettings";import { listen } from "@tauri-apps/api/event";@@ -281,6 +282,8 @@ export class WorkQueue {if (this.items.some((item) => item.projectKey === projectKey && item.kind === "image" && item.imageAssetId === scene.outputAssetId && isWorkActive(item))) return;const config = structuredClone({ ...current, providerSettings: { ...current.providerSettings,slopfab: engineProviderSetting(template.paths, current.providerSettings.slopfab, template.attention, template.loras, "prompt", template.additionalSafetensors, false, template.sources, template) } });+ const guidanceScale = imageCfgScale(template.modelType, scene.cfgScales);+ if (guidanceScale !== undefined) config.imageScene = { ...structuredClone(scene), cfgScales: { ...scene.cfgScales, [template.modelType]: guidanceScale } };const { prompt, references } = edit ? edit.edits[0] : compileImagePrompt(current, { modelType: template.modelType });const referencePaths = (selected: typeof references) => [...(edit ? [projectItemPath(session.record.folderPath, edit.source)!] : []),@@ -293,7 +296,7 @@ export class WorkQueue {const imageParentId = imageDraftId ? undefined : imageFamilyRoot(current.assets, scene.outputAssetId);let finish!: () => void;const done = new Promise<void>((resolve) => { finish = resolve; });- const request: SlopfabGenerationRequest = { generationEffects: activeGenerationEffects(scene.generationEffects), jobId: id, stillImage: true, frames: 1, prompt: edit ? edit.edits[0].prompt : prompt,+ const request: SlopfabGenerationRequest = { ...(guidanceScale !== undefined ? { guidanceScale } : {}), generationEffects: activeGenerationEffects(scene.generationEffects), jobId: id, stillImage: true, frames: 1, prompt: edit ? edit.edits[0].prompt : prompt,...(edit ? { imageEdit: { sourceRelativePath: edit.source.relativePath, edits: edit.edits.map(({ references, ...step }) => ({...step, referencePaths: referencePaths(references), refmods: referenceRefmodInputs(session.record.folderPath, references),})) } } : {}),