AI media harness for planning, generating, and editing locally
TypeScript
Remember active generators and show used settings
Bitti74256406cea5
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.mdindex fd3c59e..41c327b 100644--- a/RELEASE_NOTES.md+++ b/RELEASE_NOTES.md@@ -21,6 +21,7 @@ Changes since 0.3.2.- Improved video playback, thumbnails, Back navigation and dependent-generation queues. Non-primary takes can be removed during generation.- Image edits preserve their sources and settings; Krea no longer inherits unsupported LoRAs. Generator lists and inspector controls are more compact and consistently ordered.+- Video, image and music remember separate active generators. Saved takes show the used seed and generator, with a button to select that generator again.- Corrected First/Last Frame prompts, added custom speech languages, cached VAE checks across restarts and fixed AppImage launcher permissions.Update LAN workers alongside the app.diff --git a/docs/generator-weights.md b/docs/generator-weights.mdindex a978e63..579b78d 100644--- a/docs/generator-weights.md+++ b/docs/generator-weights.md@@ -5,6 +5,11 @@ Generator templates open in a popup over the page and save edits immediately.Escape or the popup's close button returns to the generator list. From Settings,**Back** or Escape returns to the previous screen, preserving project edits.+Video, Image and Music remember separate active generators across navigation and+restarts. Browsing saved results or changing scene types does not switch them.+The **Used seed** and **Used generator** rows describe the selected video take or+image result; use the button beside **Used generator** to select it for future runs.+**Reference icon generator** chooses the template used for automatic, manuallyregenerated, and built-in reference icons, independently of the video generator.Only available text-prompt templates appear; Animate cannot generate still icons.diff --git a/docs/scene-types.md b/docs/scene-types.mdindex bc36c24..29fa94a 100644--- a/docs/scene-types.md+++ b/docs/scene-types.md@@ -27,7 +27,7 @@ Character Replace sends only references selected by its shots, in project order.The generated prompt follows the [MiniMax H3 full-reference guide](https://huggingface.co/MiniMaxAI/MiniMax-H3/blob/main/docs/VIDEO_PROMPT_WRITING_GUIDE_ref_en.md): six sections, a video-editing task prefix, independently numbered image/video/audio payloads, and explicit retention instructions. It replaces the target's appearance while retaining motion, timing, camera work, environment and other characters. Character images define the replacement identity rather than anchoring a frame. Enabled soundtracks are reused in the corresponding shots.-Generation requires both references for every shot and respects the existing limits of three video references, nine images and 15 seconds of total video reference material. The generator picker still selects the active engine for the queue: incompatible scenes are excluded from Generate All. Changing a scene type selects a compatible downloaded generator when one is available. Character Replace requires reference-capable MiniMax weights, such as References or Singularity; known First/Last Frame weights are rejected.+Generation requires both references for every shot and respects the existing limits of three video references, nine images and 15 seconds of total video reference material. The generator picker selects the active engine for the queue: incompatible scenes are excluded from Generate All. Changing a scene type keeps the active generator; choose a compatible one when needed. Character Replace requires reference-capable MiniMax weights, such as References or Singularity; known First/Last Frame weights are rejected.Extend and Bridge require reference-capable weights and SlopFab API 1.14. The app decodes the selected reference ranges with WebCodecs. At generation time the runtime encodes the start video's last 22 frames into VAE latents at the project canvas. Bridge also encodes the end video's first 22 frames. These guides share the generated segment's spatial coordinates and sit immediately before/after it in the model's temporal coordinates. The encoded boundaries use the existing reference cache. No source latent files or FFmpeg decoding are required.diff --git a/src-tauri/src/project/scenes.rs b/src-tauri/src/project/scenes.rsindex d8b3f54..e15b2bb 100644--- a/src-tauri/src/project/scenes.rs+++ b/src-tauri/src/project/scenes.rs@@ -254,6 +254,8 @@ pub(crate) struct SceneGenerationHistory {#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]#[serde(rename_all = "camelCase")]pub(crate) struct SceneGenerationVersion {+ #[serde(default, skip_serializing_if = "Option::is_none")]+ pub(crate) generator_name: Option<String>,#[serde(default, skip_serializing_if = "Option::is_none")]pub(crate) original_latent_relative_path: Option<String>,#[serde(default, skip_serializing_if = "Option::is_none")]diff --git a/src-tauri/src/project/validation/scenes.rs b/src-tauri/src/project/validation/scenes.rsindex d9a536f..8872416 100644--- a/src-tauri/src/project/validation/scenes.rs+++ b/src-tauri/src/project/validation/scenes.rs@@ -328,7 +328,7 @@ mod history_tests {job.generator_template_id = Some("generator-original".into());job.generation_history = Some(SceneGenerationHistory {versions: vec![SceneGenerationVersion { id: "take-one".into(), created_at: job.created_at.clone(), scene: input.clone(),- media: config.assets.iter().find(|a| a.kind == "generated").unwrap().clone(), generation_snapshot: Some("saved-inputs".into()), latent_relative_path: Some("latents/one.safetensors".into()), original_latent_relative_path: None, upscale_factor: None }],+ media: config.assets.iter().find(|a| a.kind == "generated").unwrap().clone(), generator_name: Some("Saved generator".into()), generation_snapshot: Some("saved-inputs".into()), latent_relative_path: Some("latents/one.safetensors".into()), original_latent_relative_path: None, upscale_factor: None }],primary_id: Some("take-one".into()), selected_id: None, draft: Some(input),});configdiff --git a/src/components/workspace/GeneratorView.test.tsx b/src/components/workspace/GeneratorView.test.tsxindex cbefbdc..f0077a9 100644--- a/src/components/workspace/GeneratorView.test.tsx+++ b/src/components/workspace/GeneratorView.test.tsx@@ -15,6 +15,7 @@ import { choose, chooseOption, comboValue, optionNames } from "./comboTestUtils"import { chooseReference, changePromptChip, insertPromptReference, placePromptCaret, typePrompt } from "./promptTestUtils";import { saveLoras } from "../../lib/loras";import { createGeneratorTemplate, mossImageTemplate, saveGeneratorTemplateSettings, minimaxOriginalTemplate, viggleAnimateTemplate, saveDebugOptionsEnabled } from "../../lib/settings";+import { saveActiveGeneratorId, loadActiveGeneratorId } from "../../lib/settings";vi.mock("../../lib/nativeShell", async (importOriginal) => ({...await importOriginal<typeof import("../../lib/nativeShell")>(),@@ -85,6 +86,22 @@ it.each(["scene", "shot"])("generates only the selected scene from the %s inspecexpect(panel.getByRole("button", { name: "Cancel" })).toBeEnabled();});+it("uses the active video generator for every submitted scene instead of their saved generators", () => {+ const saved = createGeneratorTemplate("Saved generator"), active = createGeneratorTemplate("Active generator");+ saveGeneratorTemplateSettings({ templates: [saved, active], defaultTemplateId: saved.id });+ saveActiveGeneratorId("video", active.id);+ const config = project();+ config.generationJobs = config.generationJobs.map((job) => ({ ...job, generatorTemplateId: saved.id }));+ const generate = vi.fn();+ render(<GeneratorView config={config} folderPath="C:/project" runtime={readyRuntime} onChange={() => {}} onOpenTimeline={() => {}} onGenerate={generate} />);+ fireEvent.click(screen.getByRole("button", { name: "Select scene Second scene" }));+ expect(screen.getByRole("combobox", { name: /Video generator template/ })).toHaveTextContent(active.name);+ fireEvent.click(screen.getByRole("button", { name: "Generate all" }));+ expect(generate).toHaveBeenCalledOnce();+ expect(generate.mock.calls[0][0]).toHaveLength(config.generationJobs.length);+ expect(generate.mock.calls[0][0].every((submission: { template: { id: string } }) => submission.template.id === active.id)).toBe(true);+});+it.each([["queued", "scene"], ["generating", "scene"], ["queued", "shot"], ["generating", "shot"],] as const)("cancels only the %s scene from the %s inspector", (status, view) => {@@ -1090,7 +1107,8 @@ describe("Generator scene controls", () => {await waitFor(() => expect(document.querySelector(".generator-runtime--modelsMissing > i")).not.toBeNull());expect(getEngineStatus).toHaveBeenCalledWith(expect.objectContaining({ transformer: "draft.safetensors" }), "sage2", [], "prompt", [], true, expect.anything(), "minimax-h3");- expect(JSON.parse(localStorage.getItem("slopus.generator-templates.v1")!).defaultTemplateId).toBe("draft");+ expect(loadActiveGeneratorId("video")).toBe("draft");+ expect(JSON.parse(localStorage.getItem("slopus.generator-templates.v1")!).defaultTemplateId).toBe("quality");expect(within(screen.getByRole("region", { name: "Generator status" })).getByText("Video model files missing")).toBeInTheDocument();expect(template.closest(".generator-runtime--modelsMissing")).not.toBeNull();});@@ -1486,12 +1504,48 @@ it("restores older takes and drafts, makes a take primary, removes history and d});-it("keeps scene-type changes when automatically choosing a compatible generator", async () => {+it("keeps the active generator when changing to an incompatible scene type", async () => {vi.mocked(getEngineStatus).mockResolvedValue(readyRuntime);const prompt = { ...minimaxOriginalTemplate(), id: "prompt-template", name: "Prompt template", sources: {}, paths: { transformer: "prompt-transformer", textEncoder: "text", videoVae: "vae", audioVae: "audio", tokenizer: "tokens" } };const animate = { ...viggleAnimateTemplate(), id: "animate-template", name: "Animate template", sources: {}, loras: [], additionalSafetensors: [], paths: { transformer: "animate-transformer", textEncoder: "text", videoVae: "vae", audioVae: "audio", tokenizer: "tokens" } };saveGeneratorTemplateSettings({ templates: [prompt, animate], defaultTemplateId: prompt.id, catalogVersion: 17 });const state = setup();choose("Scene type", "Animate");- await waitFor(() => expect(state.latest().generationJobs[0]).toMatchObject({ sceneType: "animate", generatorTemplateId: "animate-template" }));+ await waitFor(() => expect(state.latest().generationJobs[0]).toMatchObject({ sceneType: "animate" }));+ expect(screen.getByRole("combobox", { name: /Video generator template/ })).toHaveTextContent("Prompt template");+});++it("keeps the active video generator while browsing takes and restores the used generator explicitly", async () => {+ vi.mocked(getEngineStatus).mockResolvedValue(readyRuntime);+ const first = createGeneratorTemplate("Original generator"), second = createGeneratorTemplate("Current generator");+ saveGeneratorTemplateSettings({ templates: [first, second], defaultTemplateId: first.id });+ saveActiveGeneratorId("video", second.id);+ let config = project();+ const id = config.generationJobs[0].id;+ for (const [index, template] of [first, second].entries()) {+ const job = { ...config.generationJobs[0], seed: -1, generatorTemplateId: template.id };+ config = { ...config, generationJobs: config.generationJobs.map((current) => current.id === id ? job : current) };+ config = completeSceneGeneration(config, id, { id: `take-${index}`, scene: sceneInput(job),+ generatorName: template.name, generationSnapshot: JSON.stringify({ seed: 100 + index }), createdAt: config.createdAt,+ media: { id: `asset-${id}`, kind: "generated", name: job.title, mimeType: "video/mp4", relativePath: `media/take-${index}.mp4`, createdAt: config.createdAt } });+ }+ const state = setup(config);+ expect(screen.getByLabelText("Used seed")).toHaveValue("101");+ expect(screen.getByLabelText("Used generator")).toHaveValue(second.name);+ fireEvent.click(screen.getByRole("button", { name: "Generation 1 of First scene" }));+ expect(screen.getByLabelText("Used seed")).toHaveValue("100");+ expect(screen.getByLabelText("Used generator")).toHaveValue(first.name);+ expect(screen.getByRole("combobox", { name: /Video generator template/ })).toHaveTextContent(second.name);+ const before = state.latest();+ const writeText = vi.fn().mockResolvedValue(undefined);+ Object.defineProperty(navigator, "clipboard", { configurable: true, value: { writeText } });+ fireEvent.click(screen.getByRole("button", { name: "Copy used seed" }));+ expect(writeText).toHaveBeenCalledWith("100");+ fireEvent.click(screen.getByRole("button", { name: "Use this generator" }));+ expect(loadActiveGeneratorId("video")).toBe(first.id);+ expect(screen.getByRole("combobox", { name: /Video generator template/ })).toHaveTextContent(first.name);+ expect(state.latest()).toEqual(before);+ cleanup();+ setup(config);+ expect(screen.getByRole("combobox", { name: /Video generator template/ })).toHaveTextContent(first.name);});diff --git a/src/components/workspace/GeneratorView.tsx b/src/components/workspace/GeneratorView.tsxindex a69ef75..9138e79 100644--- a/src/components/workspace/GeneratorView.tsx+++ b/src/components/workspace/GeneratorView.tsx@@ -3,7 +3,7 @@ import { generatorOptions } from "../generatorOptions";import { sceneUpscaleSubmission, selectedUpscaleTake } from "../../lib/sceneUpscale";import { Flyout } from "../ui";import { ChevronDown14 } from "../ui/icons";-import { duplicateScene, makeSceneGenerationPrimary, removeSceneDraft, removeSceneGeneration, saveSceneDrafts, selectSceneGeneration } from "../../lib/sceneHistory";+import { duplicateScene, makeSceneGenerationPrimary, removeSceneDraft, removeSceneGeneration, saveSceneDrafts, selectSceneGeneration, sceneUsedSeed } from "../../lib/sceneHistory";import { sceneLoraBlocker, sceneGenerationRequest, sendBlocker, templateSceneBlocker } from "../../lib/sceneGeneration";import { longShotBlocker, longShotDependencies, longShotPosition } from "../../lib/longShot";export { templateSceneBlocker } from "../../lib/sceneGeneration";@@ -28,7 +28,7 @@ import { SceneInspector, ShotInspector, STEP_SECONDS, writeShots } from "./Sceneimport { STATUS_BADGE, type SceneIndicatorStatus } from "./sceneStatus";import { forgetShotPosters } from "./ShotThumbnail";import { purgeTimelineThumbnails } from "../../lib/timelineThumbnails";-import { templateWithSceneLoras, defaultGeneratorTemplate, generationStepsForTemplate, loadDebugOptionsEnabled, loadGeneratorTemplateSettings, saveGeneratorTemplateSettings, subscribeDebugOptions, subscribeGeneratorTemplates, templateSupportsVideo, templateUsable } from "../../lib/settings";+import { templateWithSceneLoras, selectedGeneratorTemplate, loadActiveGeneratorId, saveActiveGeneratorId, subscribeActiveGenerators, generationStepsForTemplate, loadDebugOptionsEnabled, loadGeneratorTemplateSettings, subscribeDebugOptions, subscribeGeneratorTemplates, templateSupportsVideo, templateUsable } from "../../lib/settings";import { refreshDownloadedWeights } from "../../lib/weightDownloads";import { DebugPromptDialog } from "./DebugPromptDialog";import { sceneVideoSettings, videoGuidedScene } from "../../lib/videoLibrary";@@ -75,8 +75,8 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runtconst jobs = sceneIds ? sceneIds.flatMap((id) => { const job = config.generationJobs.find((job) => job.id === id); return job ? [job] : []; }) : config.generationJobs;const [selection, setSelection] = useState<GeneratorSelection>(() => ({ jobId: selectedJobId ?? jobs.find((job) => job.status === "generating")?.id ?? jobs[0]?.id ?? "", shotId: null }));const [templateSettings, setTemplateSettings] = useState(loadGeneratorTemplateSettings);- const templateFor = (job?: GenerationJob) => templateSettings.templates.find(t => t.id === job?.generatorTemplateId) ?? defaultGeneratorTemplate(templateSettings, "video");- const selectedTemplate = templateFor(jobs.find(j => j.id === selection.jobId));+ const activeGeneratorId = useSyncExternalStore(subscribeActiveGenerators, () => loadActiveGeneratorId("video"));+ const selectedTemplate = selectedGeneratorTemplate("video", templateSettings, activeGeneratorId);const defaultGenerationSteps = selectedTemplate.defaultSteps;const [generatorRuntime, setGeneratorRuntime] = useState<SlopfabStatus | null>(runtime);const [runtimeError, setRuntimeError] = useState<string | null>(null);@@ -125,13 +125,10 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runtreturn () => { window.removeEventListener("focus", refresh); window.clearInterval(timer); };}, []);- const chooseGeneratorTemplate = (templateId: string, updates: Partial<GenerationJob> = {}) => {+ const chooseGeneratorTemplate = (templateId: string) => {const template = templateSettings.templates.find((candidate) => candidate.id === templateId);if (!template || !(templateSupportsVideo(template) && templateUsable(template))) return;- const next = { ...templateSettings, defaultTemplateId: template.id };- saveGeneratorTemplateSettings(next);- setTemplateSettings(next);- updateJob(selection.jobId, { ...updates, generatorTemplateId: template.id });+ saveActiveGeneratorId("video", template.id);};useEffect(() => {@@ -163,6 +160,8 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runt/* A scene can be deleted, and a shot can be removed, from under the panel.Falling back to the first scene beats a panel pointing at nothing. */const selected = jobs.find((job) => job.id === selection.jobId) ?? jobs[0];+ const selectedTake = selected && selectedUpscaleTake(selected, config);+ const usedGenerator = selectedTake && templateSettings.templates.find((candidate) => candidate.id === selectedTake.scene.generatorTemplateId && templateSupportsVideo(candidate));const inheritedSettings = selected ? sceneVideoSettings(selected, config) : config.settings;const parentVideo = selected && config.videos?.find((video) => video.sceneIds.includes(selected.id));const animate = selected ? sceneTypeFor(selected) === "animate" : false;@@ -206,13 +205,6 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runtupdateJob(job.id, mergeSceneUpdates(job, updates));const changeSceneSettings = (job: GenerationJob, updates: Partial<GenerationJob>) => {- if (updates.sceneType && templateSceneBlocker(updates.sceneType, selectedTemplate)) {- const candidates = templateSettings.templates.filter((template) => (templateSupportsVideo(template) && templateUsable(template))- && !templateSceneBlocker(updates.sceneType!, template));- const compatible = (updates.sceneType === "character-replace" || updates.sceneType === "pose" || isVideoTransition(updates)- ? candidates.find((template) => /ref2v/i.test(template.paths.transformer)) : undefined) ?? candidates[0];- if (compatible) { chooseGeneratorTemplate(compatible.id, mergeSceneUpdates(job, updates)); return; }- }updateScene(job, updates);};@@ -345,7 +337,7 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runt};const requestFor = (job: GenerationJob): SlopfabGenerationRequest =>- sceneGenerationRequest(job, configRef.current, folderPath, templateFor(job).defaultSteps, templateFor(job));+ sceneGenerationRequest(job, configRef.current, folderPath, selectedTemplate.defaultSteps, selectedTemplate);const snapshotFor = (job: GenerationJob, request = requestFor(job)): string =>sceneGenerationSnapshot(job, request);@@ -359,7 +351,7 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runtif (!runtimeReady) return;const submissions = scenes.map((job) => {const request = requestFor(job);- return { job, request, snapshot: snapshotFor(job, request), template: templateFor(job) };+ return { job, request, snapshot: snapshotFor(job, request), template: selectedTemplate };});try { onGenerate?.(submissions); }catch (reason) { setRuntimeError(reason instanceof Error ? reason.message : String(reason)); }@@ -427,8 +419,8 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runtconst visited = new Set<string>();const visiting = new Set<string>();const visitForBatch = (job: GenerationJob): boolean => {- if (job.generatorTemplateId && !templateSettings.templates.some(t => t.id === job.generatorTemplateId) || !templateUsable(templateWithSceneLoras(templateFor(job), job))) return false;- if (sceneLoraBlocker(job, templateFor(job)) || continuationBlocker(job, config.generationJobs) || longShotBlocker(job, config, false) || templateSceneBlocker(sceneTypeFor(job), templateFor(job)) || sendBlocker(job, config.references, config)) return false;+ if (!templateUsable(templateWithSceneLoras(selectedTemplate, job))) return false;+ if (sceneLoraBlocker(job, selectedTemplate) || continuationBlocker(job, config.generationJobs) || longShotBlocker(job, config, false) || templateSceneBlocker(sceneTypeFor(job), selectedTemplate) || sendBlocker(job, config.references, config)) return false;if (visited.has(job.id)) return true;if (visiting.has(job.id)) return false;if (["queued", "generating", "ready"].includes(job.status)) { visited.add(job.id); return true; }@@ -442,7 +434,7 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runtconst priorBridge = longShotPosition(job, sceneSiblings(job, config))?.previousBridge;const previousWillRender = [...dependencies, ...(priorBridge ? [priorBridge] : [])].some((source) =>batchScenesReady.includes(source) || ["queued", "generating", "ready"].includes(source.status));- if (previousWillRender || sceneGenerationSeed(job) === RANDOM_GENERATION_SEED || job.status !== "completed"+ if (previousWillRender || (job.generatorTemplateId && job.generatorTemplateId !== selectedTemplate.id) || sceneGenerationSeed(job) === RANDOM_GENERATION_SEED || job.status !== "completed"|| !job.outputRelativePath|| (!job.latentRelativePath && (job.sceneType === "long-shot" || job.sceneType === "single-shot" || jobs.some((candidate) => continuationSceneId(candidate, jobs) === job.id)))|| !job.generationSnapshot@@ -454,10 +446,9 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runtconst generateAll = () => submit(batchScenesReady);const generationBlocker = (job: GenerationJob): string | null => {- if (job.generatorTemplateId && !templateSettings.templates.some(t => t.id === job.generatorTemplateId)) return "The saved generator is no longer available. Choose another generator.";- const loraBlocker = sceneLoraBlocker(job, templateFor(job));+ const loraBlocker = sceneLoraBlocker(job, selectedTemplate);if (loraBlocker) return loraBlocker;- if (!templateUsable(templateWithSceneLoras(templateFor(job), job))) return "Prepare this scene's generator weights before generating.";+ if (!templateUsable(templateWithSceneLoras(selectedTemplate, job))) return "Prepare the active generator's weights before generating.";if (!runtimeReady) return runtimeError ?? generatorRuntime?.detail ?? "The video generator is not ready.";if (job.status === "ready") return "Saving this scene.";const source = config.generationJobs.find((candidate) => candidate.id === continuationSceneId(job, config.generationJobs));@@ -466,7 +457,7 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runt?? longShotBlocker(job, config, true, true)?? (context && !sceneGenerationPending(context) && (!context.latentRelativePath || context.status !== "completed") ? "Generate or queue the Context video first, or use Generate all." : null)?? (source && !sceneGenerationPending(source) && (!source.latentRelativePath || source.status !== "completed") ? "Generate or queue the selected source scene first, or use Generate all." : null)- ?? templateSceneBlocker(sceneTypeFor(job), templateFor(job)) ?? sendBlocker(job, config.references, config);+ ?? templateSceneBlocker(sceneTypeFor(job), selectedTemplate) ?? sendBlocker(job, config.references, config);};const changedJobIds = new Set(jobs@@ -713,6 +704,9 @@ export function GeneratorView({ config, sceneIds, toolbarStart, folderPath, runtjob={selected}shots={selectedShots}template={selectedTemplate}+ usedGeneration={selectedTake ? { seed: sceneUsedSeed(selectedTake), generatorName: selectedTake.generatorName ?? usedGenerator?.name ?? selectedTake.scene.generatorTemplateId ?? undefined } : undefined}+ onUseGenerator={usedGenerator && templateUsable(usedGenerator) ? () => chooseGeneratorTemplate(usedGenerator.id) : undefined}+ onCopyError={setRuntimeError}defaultSteps={defaultGenerationSteps}effectiveSteps={generationStepsForTemplate(sceneGenerationSteps(selected, defaultGenerationSteps), selectedTemplate, selected.loraOverrides ?? [])}defaultLook={inheritedSettings.defaultLook}diff --git a/src/components/workspace/ImageEditor.test.tsx b/src/components/workspace/ImageEditor.test.tsxindex 9c3401a..aeb9c50 100644--- a/src/components/workspace/ImageEditor.test.tsx+++ b/src/components/workspace/ImageEditor.test.tsx@@ -581,7 +581,7 @@ it.each([false, true])("retains a renamed image root after switching images andscene: { ...snapshot.scene, nodes: snapshot.scene.nodes.map((node) => node.kind === "root" ? { ...node, name: "Cover image" } : node) } });});-it("restores the hierarchy, prompts, settings and generator when selecting a saved result", () => {+it("restores saved image settings while keeping the active generator until explicitly changed", () => {const initial = parseProjectConfig(fixture);const original = imageGenerationSnapshot(initial, "Original prompt", defaultGeneratorTemplate().id);const saved = imageGenerationSnapshotSchema.parse(snapshotFixture);@@ -593,7 +593,8 @@ it("restores the hierarchy, prompts, settings and generator when selecting a savfireEvent.click(screen.getByRole("button", { name: "View Result 1" }));expect(promptValue(screen.getByLabelText("Prompt (high-level description)"))).toBe(saved.scene.nodes[0].description);expect(screen.getByLabelText("Steps")).toHaveValue(30);- expect(comboValue(screen.getByRole("combobox", { name: "Generator" }))).toBe(saved.generatorTemplateId);+ expect(comboValue(screen.getByRole("combobox", { name: "Generator" }))).toBe(original.generatorTemplateId);+ expect(screen.getByLabelText("Used generator")).toHaveValue("Lantern generator");expect(screen.getByRole("button", { name: "Lantern" })).toBeInTheDocument();expect(screen.getByRole("button", { name: "Lettering" })).toBeInTheDocument();expect(current().references).toEqual(saved.references);@@ -608,6 +609,9 @@ it("restores the hierarchy, prompts, settings and generator when selecting a savfireEvent.click(screen.getByRole("button", { name: "View Result 1" }));expect(current().imageScene).toEqual({ ...saved.scene, outputAssetId: "result-1" });expect(current().assets[1].imageGeneration).toEqual(saved);+ fireEvent.click(screen.getByRole("button", { name: "Use this generator" }));+ expect(comboValue(screen.getByRole("combobox", { name: "Generator" }))).toBe(saved.generatorTemplateId);+ expect(current().imageScene).toEqual({ ...saved.scene, outputAssetId: "result-1" });expect(current().settings).toEqual(initial.settings);expect(current().brief.resolution).toBe(initial.brief.resolution);expect(current().brief.aspectRatio).toBe(initial.brief.aspectRatio);diff --git a/src/components/workspace/ImageEditor.tsx b/src/components/workspace/ImageEditor.tsxindex 13dae99..dc405a1 100644--- a/src/components/workspace/ImageEditor.tsx+++ b/src/components/workspace/ImageEditor.tsx@@ -17,6 +17,8 @@ import { createEmptyImage, imageFamily, imageFamilyRoot, makeImagePrimary, removimport { isTauri } from "../../lib/persistence";import { createDraftGenerationJob, isVideoReference, PROJECT_RESOLUTIONS, referenceTypeLabel, type ProjectConfig, type ProjectReference } from "../../lib/project";import { defaultGeneratorTemplate, selectedImageGeneratorTemplate, generationStepsForTemplate, loadDebugOptionsEnabled, loadGeneratorTemplateSettings, MINIMAX_H3_MODEL_TYPE, generatorModel, templateSupportsImages, templateSupportsEditing, templateSupportsOutpainting, subscribeDebugOptions, subscribeGeneratorTemplates, templateUsable, type GeneratorTemplate } from "../../lib/settings";+import { loadActiveGeneratorId, saveActiveGeneratorId, subscribeActiveGenerators } from "../../lib/settings";+import { UsedSeed, UsedGenerator } from "./UsedGeneration";import { isWorkActive, MAX_IMAGE_BATCH_COUNT, type WorkItem } from "../../lib/workQueue";import type { ConfigUpdate } from "./TimelineView";import { ReferenceImage } from "./ReferenceImage";@@ -44,16 +46,6 @@ import "../../styles/image-editor.css";const MIN_IMAGE_ZOOM = 0.1;const MAX_IMAGE_ZOOM = 8;-function UsedImageSeed({ id, seed, onError }: { id: string; seed: number | undefined; onError: (message: string) => void }) {- return <PropRow label="Used seed" htmlFor={id}>- <input id={id} className="text-field" readOnly value={seed ?? "Not recorded"} />- <button type="button" className="icon-button" aria-label="Copy used seed" data-tooltip="Copy used seed" disabled={seed === undefined} onClick={async () => {- try { await navigator.clipboard.writeText(String(seed)); }- catch { onError("Could not copy the seed. Select and copy it from the field."); }- }}><Copy16 aria-hidden="true" /></button>- </PropRow>;-}-export function ImageEditor({ config, folderPath, onChange: changeConfig, onGenerate, onGenerateCharacterSheet, onGenerateExtend, onCancel, onOpenGenerator, onOpenReferences, workItems = [], openImage, onImageOpened, onBackNavigationChange }: {config: ProjectConfig; folderPath: string; onChange: (update: ConfigUpdate) => void;onGenerate: (template: GeneratorTemplate, count: number) => void; onCancel: (id: string) => Promise<void>; workItems?: readonly WorkItem[];@@ -102,9 +94,10 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGeneconst inspectorPane = usePaneSize("image.inspector", 300, { min: 240, max: 520 });const clipboard = useSyncExternalStore(subscribeImageNodeClipboard, getImageNodeClipboard);const [templates, setTemplates] = useState(loadGeneratorTemplateSettings);- const [templateId, setTemplateId] = useState(() => selectedImageGeneratorTemplate().id);+ const templateId = useSyncExternalStore(subscribeActiveGenerators, () => loadActiveGeneratorId("image"));const imageTemplates = templates.templates.filter(templateSupportsImages);- const template = imageTemplates.find((candidate) => candidate.id === templateId) ?? imageTemplates.find(templateUsable) ?? imageTemplates[0];+ const template = imageTemplates.find((candidate) => candidate.id === templateId) ?? imageTemplates.find((candidate) => candidate.id === selectedImageGeneratorTemplate(templates).id) ?? imageTemplates[0];+ const usedGenerator = imageTemplates.find((candidate) => candidate.id === generatedImage?.imageGeneration?.generatorTemplateId);const model = generatorModel(template?.modelType);const cfgDefault = template ? imageCfgScale(template.modelType, undefined, template.kreaVariant) ?? 0 : 0;const editPlan = useMemo(() => {@@ -270,10 +263,6 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGeneundo.current = []; redo.current = []; historyChanged((value) => value + 1);pointer.current = null; setDraftBox(null); setDraftLasso(null); setDrawKind(null); setRenaming(null);setCollapsed(new Set()); setSelection(snapshot?.scene.nodes.find((node) => node.kind === "root")?.id ?? "image-root");- if (snapshot && imageTemplates.some((candidate) => candidate.id === snapshot.generatorTemplateId)) {- setTemplateId(snapshot.generatorTemplateId);- localStorage.setItem("slopus.image-generator-template.v1", snapshot.generatorTemplateId);- }};const selectImage = (id: string) => {resetImageEditing(id);@@ -660,7 +649,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGenedisabled={Boolean(active) || !imageTemplates.length}placeholder="No image generators"options={generatorOptions(imageTemplates, (item) => ({ disabled: !templateUsable(item) || (imageRoot && !templateSupportsEditing(item)), description: imageRoot && !templateSupportsEditing(item) ? "Does not support editing" : !templateUsable(item) ? "Download in Settings" : undefined }))}- onChange={(id) => { setTemplateId(id); localStorage.setItem("slopus.image-generator-template.v1", id); const next = imageTemplates.find((candidate) => candidate.id === id); if (next) commit({ ...scene, steps: next.defaultSteps }); }}+ onChange={(id) => { saveActiveGeneratorId("image", id); const next = imageTemplates.find((candidate) => candidate.id === id); if (next) commit({ ...scene, steps: next.defaultSteps }); }}/></div><div className="image-tools__center">@@ -859,7 +848,11 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGeneonCommit={(value) => 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} />}+ {generatedImage && <>+ <UsedSeed id={rootField("used-seed")} seed={usedSeed} onError={setError} />+ <UsedGenerator id={rootField("used-generator")} name={usedGenerator?.name ?? generatedImage.imageGeneration?.template?.generatorName ?? generatedImage.imageGeneration?.generatorTemplateId}+ onUse={usedGenerator && templateUsable(usedGenerator) ? () => saveActiveGeneratorId("image", usedGenerator.id) : undefined} />+ </>}{!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>}{imageRoot ? editSize && <PropRow label="Resolution" htmlFor={rootField("resolution")}><ComboBox id={rootField("resolution")} aria-label="Resolution" value={sizeValue(editSize)} options={editSizes.map((size) => ({ value: sizeValue(size), label: `${size.width} × ${size.height}` }))} onChange={(value) => { const size = editSizes.find((size) => sizeValue(size) === value); if (size) commit({ ...scene, outputSize: size }); }} /></PropRow> : <PropRow label="Resolution" htmlFor={rootField("resolution")}><ComboBox id={rootField("resolution")} aria-label="Resolution" value={settings.resolution} options={[...new Set([...PROJECT_RESOLUTIONS, settings.resolution])].map((resolution) => { const size = outputDimensions(resolution, settings.aspectRatio); return { value: resolution, label: `${size.width} × ${size.height}` }; })} onChange={(value) => { const resolution = value as ProjectConfig["settings"]["resolution"]; onChange((current) => ({ ...current, imageSettings: { ...imageSettings(current), resolution } })); }} /></PropRow>}</PropSection>diff --git a/src/components/workspace/MusicView.test.tsx b/src/components/workspace/MusicView.test.tsxindex 3cd9184..b2585e4 100644--- a/src/components/workspace/MusicView.test.tsx+++ b/src/components/workspace/MusicView.test.tsx@@ -298,6 +298,13 @@ it("copies generated music to a draft when changing its generator", () => {expect(latest.musicSongs).toHaveLength(2);expect(latest.musicSongs![0]).toEqual(original);expect(latest.musicSongs![1]).toMatchObject({ generatorId: "other-music", steps: 16, status: "draft", assetId: null });+ fireEvent.click(screen.getByRole("button", { name: "Select Evening" }));+ expect(screen.getByRole("combobox", { name: "Generator" })).toHaveAttribute("data-value", "other-music");+ fireEvent.click(screen.getByRole("button", { name: "Generate" }));+ expect(generate).toHaveBeenCalledWith(original.id, expect.objectContaining({ id: "other-music" }));+ const saved = latest;+ cleanup(); render(<Harness initial={saved} />);+ expect(screen.getByRole("combobox", { name: "Generator" })).toHaveAttribute("data-value", "other-music");});it.each(["Grid", "List"])("distinguishes playable songs from drafts and missing audio in %s view", (view) => {diff --git a/src/components/workspace/MusicView.tsx b/src/components/workspace/MusicView.tsxindex c21b109..9f6a13e 100644--- a/src/components/workspace/MusicView.tsx+++ b/src/components/workspace/MusicView.tsx@@ -1,4 +1,5 @@-import { useEffect, useRef, useState } from "react";+import { useEffect, useRef, useState, useSyncExternalStore } from "react";+import { loadActiveGeneratorId, saveActiveGeneratorId, selectedGeneratorTemplate, subscribeActiveGenerators } from "../../lib/settings";import type { ProjectAsset, ProjectConfig } from "../../lib/project";import { isTauri, readMediaFileUrl } from "../../lib/persistence";import { loadGeneratorTemplateSettings, subscribeGeneratorTemplates, templateSupportsMusic, templateUsable, generatorPathFields, type GeneratorTemplate } from "../../lib/settings";@@ -49,8 +50,9 @@ export function MusicView({ config, folderPath, onChange, onGenerate, onGenerateconst [selectedId, setSelectedId] = useState(config.musicSongs?.[0]?.id);useEffect(() => { if (openSong) { setFolderId(config.musicSongs?.find((song) => song.id === openSong.id)?.folderId ?? null); setSelectedId(openSong.id); onSongOpened?.(); } }, [openSong]);const selected = visibleSongs.find((song) => song.id === selectedId) ?? visibleSongs[0];- const [newGeneratorId, setNewGeneratorId] = useState(templates[0]?.id ?? "");- const template = templates.find((item) => item.id === (selected?.generatorId ?? newGeneratorId)) ?? templates[0];+ const activeGeneratorId = useSyncExternalStore(subscribeActiveGenerators, () => loadActiveGeneratorId("music"));+ const chosenTemplate = selectedGeneratorTemplate("music", loadGeneratorTemplateSettings(), activeGeneratorId);+ const template = templates.find((item) => item.id === chosenTemplate.id) ?? templates[0];const [view, setView] = useState<"grid" | "list">(() => localStorage.getItem("slopus.music.view") === "list" ? "list" : "grid");const inspector = usePaneSize("music.inspector", 340, { min: 280, max: 560 });const menu = useContextMenu();@@ -122,7 +124,7 @@ export function MusicView({ config, folderPath, onChange, onGenerate, onGenerate});const chooseGenerator = (id: string) => {const next = templates.find((item) => item.id === id);- setNewGeneratorId(id);+ saveActiveGeneratorId("music", id);if (next && selected) edit({ generatorId: id, steps: Math.min(100, next.defaultSteps), settings: musicSettingsForModel(selected.settings, next.modelType) });};const generate = () => {diff --git a/src/components/workspace/SceneEditor.tsx b/src/components/workspace/SceneEditor.tsxindex 64a1ecb..0bb1fd8 100644--- a/src/components/workspace/SceneEditor.tsx+++ b/src/components/workspace/SceneEditor.tsx@@ -1,4 +1,5 @@import { GenerationEffects } from "./GenerationEffects";+import { UsedSeed, UsedGenerator } from "./UsedGeneration";import { SceneLoras } from "./SceneLoras";import { generatorModel } from "../../lib/generatorModels";import { DEFAULT_VIDEO_SIGMA_SHIFT, DEFAULT_AUDIO_SIGMA_SHIFT } from "../../lib/sampling";@@ -317,7 +318,10 @@ const SCENE_TYPE_DESCRIPTIONS: Record<SceneType, string> = {* §4.1), and the two sound fields defined per prompt (§4.6, §4.7). Length* lives in the scene header where it stays visible. Simple label + control* pairs are inspector rows; the free-text fields stay full width. */-export function SceneInspector({ job, shots, references, folderPath = "", scenes = [], neighborScenes = scenes, defaultSteps, effectiveSteps, template, defaultLook, defaultLookSource = "project", disabled, importAvailable, importError, onAddStartFrame, onAddEndFrame, onChange, onShots, sceneType = sceneTypeFor(job) }: {+export function SceneInspector({ job, shots, references, folderPath = "", scenes = [], neighborScenes = scenes, defaultSteps, effectiveSteps, template, usedGeneration, onUseGenerator, onCopyError, defaultLook, defaultLookSource = "project", disabled, importAvailable, importError, onAddStartFrame, onAddEndFrame, onChange, onShots, sceneType = sceneTypeFor(job) }: {+ usedGeneration?: { seed?: number; generatorName?: string };+ onUseGenerator?: () => void;+ onCopyError?: (message: string) => void;sceneType?: SceneType;defaultLook?: string | null;defaultLookSource?: "project" | "Video";@@ -580,6 +584,10 @@ export function SceneInspector({ job, shots, references, folderPath = "", scenesonCommit={(value) => onChange({ seed: value })}/></PropRow>+ {usedGeneration && <>+ <UsedSeed id={`${id}-used-seed`} seed={usedGeneration.seed} onError={onCopyError ?? (() => {})} />+ <UsedGenerator id={`${id}-used-generator`} name={usedGeneration.generatorName} onUse={onUseGenerator} />+ </>}<PropRow label="Advanced options" htmlFor={`${id}-advanced-options`} tooltip="Show sigma shifts, a separate audio step count and LoRAs."><ToggleSwitch id={`${id}-advanced-options`} aria-label="Advanced options" checked={job.audioSteps != null} disabled={disabled}onChange={(checked) => onChange({ audioSteps: checked ? Math.min(sceneGenerationSteps(job, defaultSteps), MAX_AUDIO_GENERATION_STEPS) : undefined })} />diff --git a/src/components/workspace/UsedGeneration.tsx b/src/components/workspace/UsedGeneration.tsxnew file mode 100644index 0000000..8d942e6--- /dev/null+++ b/src/components/workspace/UsedGeneration.tsx@@ -0,0 +1,20 @@+import { PropRow } from "../ui";+import { Copy16, Reset16 } from "../ui/icons";++export function UsedSeed({ id, seed, onError }: { id: string; seed?: number; onError: (message: string) => void }) {+ return <PropRow label="Used seed" htmlFor={id}>+ <input id={id} className="text-field" readOnly value={seed ?? "Not recorded"} />+ <button type="button" className="icon-button" aria-label="Copy used seed" data-tooltip="Copy used seed" disabled={seed === undefined} onClick={async () => {+ try { await navigator.clipboard.writeText(String(seed)); }+ catch { onError("Could not copy the seed. Select and copy it from the field."); }+ }}><Copy16 aria-hidden="true" /></button>+ </PropRow>;+}++export function UsedGenerator({ id, name, onUse }: { id: string; name?: string; onUse?: () => void }) {+ return <PropRow label="Used generator" htmlFor={id}>+ <input id={id} className="text-field" readOnly value={name ?? "Not recorded"} title={name} />+ <button type="button" className="icon-button" aria-label="Use this generator" disabled={!onUse}+ data-tooltip={onUse ? "Use this generator" : "Generator unavailable"} onClick={onUse}><Reset16 aria-hidden="true" /></button>+ </PropRow>;+}diff --git a/src/lib/project.ts b/src/lib/project.tsindex e0ff1c8..8a4ecde 100644--- a/src/lib/project.ts+++ b/src/lib/project.ts@@ -646,6 +646,7 @@ export const sceneInputSchema = generationJobBaseSchema.omit({ id: true, status:export type SceneInput = z.infer<typeof sceneInputSchema>;export const sceneGenerationVersionSchema = z.object({id: idSchema, createdAt: isoDateSchema, scene: sceneInputSchema, media: projectAssetSchema,+ generatorName: z.string().optional(),generationSnapshot: z.string().nullish(), latentRelativePath: projectRelativePathSchema.nullish(),originalLatentRelativePath: projectRelativePathSchema.nullish(),upscaleFactor: z.number().refine(value => [1.5, 2, 4].includes(value)).optional(),diff --git a/src/lib/sceneHistory.test.ts b/src/lib/sceneHistory.test.tsindex 721210b..7171858 100644--- a/src/lib/sceneHistory.test.ts+++ b/src/lib/sceneHistory.test.ts@@ -1,10 +1,17 @@import { describe, expect, it, vi } from "vitest";import { createProjectConfig, generationAssetId, parseProjectConfig, type ProjectConfig, type SceneGenerationVersion } from "./project";-import { completeSceneGeneration, duplicateScene, makeSceneGenerationPrimary, removeSceneDraft, removeSceneGeneration, saveSceneDrafts, sceneInput, selectSceneGeneration, SCENE_GENERATION_HISTORY_LIMIT } from "./sceneHistory";+import { completeSceneGeneration, duplicateScene, makeSceneGenerationPrimary, removeSceneDraft, removeSceneGeneration, saveSceneDrafts, sceneInput, selectSceneGeneration, sceneUsedSeed, SCENE_GENERATION_HISTORY_LIMIT } from "./sceneHistory";import { ProjectSession } from "./projectSession";const initial = () => createProjectConfig({ name: "History", prompt: "A quiet scene", aspectRatio: "16:9", resolution: "416p", targetDurationSeconds: 5 });+it("reports recorded seeds, falls back to legacy fixed seeds and leaves unknown random seeds unset", () => {+ const version = take(initial(), "seed-test");+ expect(sceneUsedSeed({ ...version, scene: { ...version.scene, seed: -1 }, generationSnapshot: '{"seed":123}' })).toBe(123);+ expect(sceneUsedSeed({ ...version, scene: { ...version.scene, seed: 42 }, generationSnapshot: "legacy" })).toBe(42);+ expect(sceneUsedSeed({ ...version, scene: { ...version.scene, seed: -1 }, generationSnapshot: '{"seed":-1}' })).toBeUndefined();+});+it("keeps original reference latents across upscaled primaries, history pruning and reloads", () => {let config = finish(initial(), "original");const id = config.generationJobs[0].id;diff --git a/src/lib/sceneHistory.ts b/src/lib/sceneHistory.tsindex d62d6f5..533138d 100644--- a/src/lib/sceneHistory.ts+++ b/src/lib/sceneHistory.ts@@ -29,6 +29,13 @@ export function sceneHistory(job: GenerationJob, assets: readonly ProjectAsset[]return { versions: [version], primaryId: version.id, selectedId: version.id, draft: null };}+export function sceneUsedSeed(version: SceneGenerationVersion): number | undefined {+ let seed: unknown;+ try { seed = JSON.parse(version.generationSnapshot ?? "null")?.seed; } catch { /* Legacy result. */ }+ seed ??= version.scene.seed;+ return typeof seed === "number" && Number.isSafeInteger(seed) && seed >= 0 ? seed : undefined;+}+/** Also called by sessions, so agent edits and edits during rendering create a* draft just like inspector changes. Merely browsing a take is not an edit. */export function saveSceneDrafts(config: ProjectConfig, previous?: ProjectConfig): ProjectConfig {diff --git a/src/lib/settings.test.ts b/src/lib/settings.test.tsindex 036a19f..9511462 100644--- a/src/lib/settings.test.ts+++ b/src/lib/settings.test.ts@@ -1,6 +1,7 @@// @vitest-environment jsdomimport { localGeneratorTemplate as createGeneratorTemplate } from "./h3TestUtils";+import { saveActiveGeneratorId, loadActiveGeneratorId, selectedGeneratorTemplate } from "./settings";import { beforeEach, describe, expect, it } from "vitest";import { TURBO_LORA, VIGGLE_ANIMATE_LORA, loadLoras, saveLoras } from "./loras";import {@@ -37,6 +38,22 @@ function generatorOwned(value: any): any {describe("generator templates", () => {beforeEach(() => localStorage.clear());+ it("remembers independent active generators and falls back only when the selected template is removed", () => {+ const video = createGeneratorTemplate("Video"), image = createGeneratorTemplate("Image"), music = musicTemplates()[0];+ const settings = { templates: [video, image, music], defaultTemplateId: video.id };+ saveActiveGeneratorId("video", video.id);+ saveActiveGeneratorId("image", image.id);+ saveActiveGeneratorId("music", music.id);+ for (const [medium, template] of [["video", video], ["image", image], ["music", music]] as const) {+ expect(loadActiveGeneratorId(medium)).toBe(template.id);+ expect(selectedGeneratorTemplate(medium, settings).id).toBe(template.id);+ }+ saveActiveGeneratorId("video", image.id);+ expect(selectedGeneratorTemplate("music", settings).id).toBe(music.id);+ expect(selectedImageGeneratorTemplate(settings).id).toBe(image.id);+ expect(selectedImageGeneratorTemplate({ ...settings, templates: [video, music] }).id).toBe(video.id);+ });+it("adds Krea Turbo and Raw once with three weights, preserving custom templates and removal", () => {const [turbo, raw] = kreaImageTemplates();for (const template of [turbo, raw]) {diff --git a/src/lib/settings.ts b/src/lib/settings.tsindex d616b77..0b9a7f3 100644--- a/src/lib/settings.ts+++ b/src/lib/settings.ts@@ -786,8 +786,36 @@ export function saveGeneratorTemplateSettings(settings: GeneratorTemplateSettingqueueMicrotask(() => window.dispatchEvent(new Event(GENERATOR_TEMPLATES_EVENT)));}-export function defaultGeneratorTemplate(settings = loadGeneratorTemplateSettings(), medium?: "video" | "image"): GeneratorTemplate {- const eligible = settings.templates.filter((template) => medium === "video" ? templateSupportsVideo(template) : medium === "image" ? templateSupportsImages(template) : true);+export type GeneratorMedium = "video" | "image" | "music";+const ACTIVE_GENERATOR_EVENT = "slopus:active-generator-changed";+const activeGeneratorKey = (medium: GeneratorMedium) => `slopus.${medium}-generator-template.v1`;+const activeGeneratorFallback: Partial<Record<GeneratorMedium, string>> = {};++export function loadActiveGeneratorId(medium: GeneratorMedium): string {+ if (activeGeneratorFallback[medium] !== undefined) return activeGeneratorFallback[medium]!;+ try { return localStorage.getItem(activeGeneratorKey(medium)) ?? ""; } catch { return ""; }+}++export function saveActiveGeneratorId(medium: GeneratorMedium, id: string) {+ try { localStorage.setItem(activeGeneratorKey(medium), id); delete activeGeneratorFallback[medium]; }+ catch { activeGeneratorFallback[medium] = id; }+ window.dispatchEvent(new Event(ACTIVE_GENERATOR_EVENT));+}++export function subscribeActiveGenerators(listener: () => void) {+ const storage = (event: StorageEvent) => {+ if (event.key === null || (["video", "image", "music"] as const).some((medium) => event.key === activeGeneratorKey(medium))) listener();+ };+ window.addEventListener(ACTIVE_GENERATOR_EVENT, listener);+ window.addEventListener("storage", storage);+ return () => { window.removeEventListener(ACTIVE_GENERATOR_EVENT, listener); window.removeEventListener("storage", storage); };+}++const supportsMedium = (template: GeneratorTemplate, medium?: GeneratorMedium) =>+ medium === "video" ? templateSupportsVideo(template) : medium === "image" ? templateSupportsImages(template) : medium === "music" ? templateSupportsMusic(template) : true;++export function defaultGeneratorTemplate(settings = loadGeneratorTemplateSettings(), medium?: GeneratorMedium): GeneratorTemplate {+ const eligible = settings.templates.filter((template) => supportsMedium(template, medium));return eligible.find((template) => template.id === settings.defaultTemplateId && templateUsable(template))?? eligible.find(templateUsable)?? { id: "", name: "No downloaded generators", modelType: MINIMAX_H3_MODEL_TYPE, defaultSteps: DEFAULT_GENERATION_STEPS, attention: "sage2", paths: copyPaths(EMPTY_ENGINE_SETTINGS) };@@ -795,9 +823,12 @@ export function defaultGeneratorTemplate(settings = loadGeneratorTemplateSetting/** Match the image page's remembered selection when initializing new images. */export function selectedImageGeneratorTemplate(settings = loadGeneratorTemplateSettings()): GeneratorTemplate {- const id = localStorage.getItem("slopus.image-generator-template.v1");- return settings.templates.find((template) => template.id === id && templateSupportsImages(template))- ?? defaultGeneratorTemplate(settings, "image");+ return selectedGeneratorTemplate("image", settings);+}++export function selectedGeneratorTemplate(medium: GeneratorMedium, settings = loadGeneratorTemplateSettings(), id = loadActiveGeneratorId(medium)): GeneratorTemplate {+ return settings.templates.find((template) => template.id === id && supportsMedium(template, medium))+ ?? defaultGeneratorTemplate(settings, medium);}export function loadDefaultGenerationSteps(): number {diff --git a/src/lib/workQueue.test.ts b/src/lib/workQueue.test.tsindex cef38a7..3aaa028 100644--- a/src/lib/workQueue.test.ts+++ b/src/lib/workQueue.test.ts@@ -71,6 +71,27 @@ const finish = async (queue: WorkQueue, id: string) => {await waitFor(() => expect(queue.getSnapshot().find((item) => item.id === id)?.status).toBe("completed"));};+it("records the actual random video seed and generator name without changing the scene's random setting", async () => {+ const { queue, first } = setup();+ const run = submission(first);+ run.job = { ...run.job, seed: -1 };+ run.request.seed = -1;+ const template = loadGeneratorTemplateSettings().templates[0];+ queue.enqueue(first, [run], template);+ await waitFor(() => expect(enqueueSlopfabGeneration).toHaveBeenCalledOnce());+ const request = vi.mocked(enqueueSlopfabGeneration).mock.calls[0][0];+ expect(Number.isSafeInteger(request.seed)).toBe(true);+ expect(request.seed).toBeGreaterThanOrEqual(0);+ expect(vi.mocked(resolveSlopfabPlan).mock.calls[0][0].seed).toBe(request.seed);+ await finish(queue, request.jobId);+ const job = parseProjectConfig(first.getSnapshot().config).generationJobs[0];+ const take = job.generationHistory!.versions[0];+ expect(job.seed).toBe(-1);+ expect(take.scene).toMatchObject({ seed: -1, generatorTemplateId: template.id });+ expect(JSON.parse(take.generationSnapshot!).seed).toBe(request.seed);+ expect(take.generatorName).toBe(template.name);+});+const coverTemplate = () => {const template = kreaImageTemplates()[0];return { ...template, sources: {}, paths: { ...template.paths, transformer: "C:/weights/krea.safetensors", textEncoder: "C:/weights/text.safetensors", videoVae: "C:/weights/vae.safetensors" } };@@ -146,7 +167,7 @@ it("captures global order and scene overrides before queued generation and keepsconst options = captured.providerSettings.slopfab.options;expect(options.motionCache).toBeUndefined();expect(JSON.parse(options.loras as string)).toEqual([{ path: "D:/dmad", strength: 1 }, { path: "D:/style", strength: 0.6 }]);- expect(first.getSnapshot().config.generationJobs[0].generationSnapshot).toBe(snapshot);+ expect(JSON.parse(first.getSnapshot().config.generationJobs[0].generationSnapshot!)).toEqual({ ...JSON.parse(snapshot), seed: sent.seed });await finish(queue, id);expect(first.getSnapshot().config.generationJobs[0].generationHistory?.versions[0].scene.loraOverrides).toEqual(job.loraOverrides);});diff --git a/src/lib/workQueue.ts b/src/lib/workQueue.tsindex 74bceea..035e9bf 100644--- a/src/lib/workQueue.ts+++ b/src/lib/workQueue.ts@@ -73,6 +73,7 @@ export interface WorkItem {settings: { frames: number; steps: number; audioSteps?: number; videoSigmaShift?: number; audioSigmaShift?: number; latentUpscale?: boolean; seed: number; canvasWidth: number; canvasHeight: number };}interface PendingWork {+ generatorName?: string;albumCoverSongId?: string;upscaleSource?: import("./project").SceneGenerationVersion;music?: MusicSong;@@ -255,11 +256,11 @@ export class WorkQueue {ids.push(id);let finish!: () => void;const done = new Promise<void>((resolve) => { finish = resolve; });- const request = structuredClone({ ...submission.request, jobId: id, loraSnapshot: loraSnapshot(effectiveLoras(chosen.loras, submission.job.loraOverrides ?? [], chosen.modelType)), ...(!submission.upscaleSource ? { steps: generationStepsWithLoras(submission.request.steps, config),+ const request = structuredClone({ ...submission.request, jobId: id, seed: submission.upscaleSource ? submission.request.seed : imageGenerationSeed(submission.request.seed), loraSnapshot: loraSnapshot(effectiveLoras(chosen.loras, submission.job.loraOverrides ?? [], chosen.modelType)), ...(!submission.upscaleSource ? { steps: generationStepsWithLoras(submission.request.steps, config),...generationSigmaShiftsWithLoras(submission.request, config) } : {}) });- const snapshot = !submission.upscaleSource && (request.loraSnapshot.length || submission.request.loraSnapshot?.length)+ const snapshot = !submission.upscaleSource && (request.seed !== submission.request.seed || request.loraSnapshot.length || submission.request.loraSnapshot?.length)? sceneGenerationSnapshot(captured, request) : submission.snapshot;- this.work.set(id, { id, session, sceneId: submission.job.id, sceneInput: structuredClone(submission.upscaleSource?.scene ?? sceneInput(captured)), upscaleSource: submission.upscaleSource && structuredClone(submission.upscaleSource), request, config, snapshot, cancelled: false, submitted: false, done, finish });+ this.work.set(id, { id, generatorName: submission.upscaleSource ? submission.upscaleSource.generatorName : chosen.name, session, sceneId: submission.job.id, sceneInput: structuredClone(submission.upscaleSource?.scene ?? sceneInput(captured)), upscaleSource: submission.upscaleSource && structuredClone(submission.upscaleSource), request, config, snapshot, cancelled: false, submitted: false, done, finish });this.items = [...this.items, {id, generationGroupId: id, projectKey, folderPath: session.record.folderPath, projectName: config.name,sceneId: submission.job.id, title: submission.job.title, submittedAt: new Date().toISOString(),@@ -894,6 +895,7 @@ export class WorkQueue {} : undefined);const media = { kind: "generated" as const, relativePath: saved.relativePath, sourcePath: null, mimeType: "video/mp4", hasAudio: saved.hasAudio ?? null, width: saved.width ?? work.request.canvasWidth, height: saved.height ?? work.request.canvasHeight, durationMs: saved.durationMs ?? Math.round(totalFrames / GENERATION_FRAME_RATE * 1000), sceneSegments };const version = { id: work.id, createdAt: new Date().toISOString(), scene: work.sceneInput!,+ generatorName: work.generatorName,media: { ...media, id: assetId, name: work.sceneInput!.title, createdAt: new Date().toISOString() },generationSnapshot: work.snapshot, latentRelativePath: generationLatentPath(work.id),...(work.upscaleSource ? { originalLatentRelativePath: work.upscaleSource.originalLatentRelativePath ?? work.upscaleSource.latentRelativePath,