AI media harness for planning, generating, and editing locally
TypeScript
Use generator step defaults for new images
Bitti43438e291e7b
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.mdindex ab1f3f7..33c4f42 100644--- a/RELEASE_NOTES.md+++ b/RELEASE_NOTES.md@@ -28,6 +28,8 @@ This alpha update adds Prompt video scenes, agent image drafts, Sol attention an## Fixes and improvements+- New image projects, empty images and imported images use the selected image generator's default steps, including four for Fibo 2.0. Saved image step choices remain intact.+- Renamed the Generator settings section to Generators. Refined the lasso icon and integrated the image Generate arrow into one split control. Count help now appears on the label tooltip. Model capabilities disable Object, Text, Group and Background creation for MiniMax H3 while keeping them available for MOSS and Fibo; existing image edits retain Edit Box and Lasso.- First/Last Frame now uses Winnougan's FL2VA W4A8 fallback. Saved fallback selections migrate to the correct model; References retains its REF2VA fallback.diff --git a/src/components/workspace/ImageEditor.test.tsx b/src/components/workspace/ImageEditor.test.tsxindex 7e15097..f030d5c 100644--- a/src/components/workspace/ImageEditor.test.tsx+++ b/src/components/workspace/ImageEditor.test.tsx@@ -1343,3 +1343,23 @@ it("shows model-specific negative prompts, preserves them across model switchesexpect(screen.getByRole("textbox", { name: "Negative prompt" })).toHaveValue("Watermarks, blurry details");expect(screen.queryByText("Background (environment)")).not.toBeInTheDocument();});++it("uses Fibo's four-step default for fresh images and imports, preserving saved steps", () => {+ const fibo = createGeneratorTemplate("Fibo", "fibo2");+ saveGeneratorTemplateSettings({ templates: [fibo], defaultTemplateId: fibo.id, catalogVersion: 14 });+ const initial = parseProjectConfig(fixture);+ initial.imageScene!.steps = 12;+ const imported = { id: "imported", kind: "image" as const, name: "Imported", relativePath: "media/source.png", width: 512, height: 512, mimeType: "image/png", createdAt: initial.createdAt };+ initial.assets = [imported, { ...imported, id: "saved", name: "Saved", imageGeneration: imageGenerationSnapshot(initial, "Saved prompt", fibo.id) }];+ const latest = setup(initial);+ fireEvent.click(screen.getByRole("button", { name: "View Imported" }));+ expect(screen.getByLabelText("Steps")).toHaveValue(4);+ fireEvent.click(screen.getByRole("button", { name: "View Saved" }));+ expect(screen.getByLabelText("Steps")).toHaveValue(12);+ fireEvent.contextMenu(screen.getByLabelText("Generated images"));+ fireEvent.click(screen.getByRole("menuitem", { name: "New empty image" }));+ expect(screen.getByLabelText("Steps")).toHaveValue(4);+ expect(latest().imageScene!.steps).toBe(4);+ fireEvent.change(screen.getByLabelText("Steps"), { target: { value: "8" } });+ expect(latest().imageScene!.steps).toBe(8);+});diff --git a/src/components/workspace/ImageEditor.tsx b/src/components/workspace/ImageEditor.tsxindex 610cd44..5e6bb5d 100644--- a/src/components/workspace/ImageEditor.tsx+++ b/src/components/workspace/ImageEditor.tsx@@ -13,7 +13,7 @@ import { compileImagePrompt } from "../../lib/imagePrompt";import { createEmptyImage, imageFamily, imageFamilyRoot, makeImagePrimary, removeImageAsset, restoreGeneratedImage, saveImageDraft } from "../../lib/imageHistory";import { isTauri } from "../../lib/persistence";import { createDraftGenerationJob, isVideoReference, PROJECT_RESOLUTIONS, referenceTypeLabel, type ProjectConfig, type ProjectReference } from "../../lib/project";-import { defaultGeneratorTemplate, generationStepsForTemplate, loadDebugOptionsEnabled, loadGeneratorTemplateSettings, MINIMAX_H3_MODEL_TYPE, generatorModel, templateSupportsImages, subscribeDebugOptions, subscribeGeneratorTemplates, templateUsable, type GeneratorTemplate } from "../../lib/settings";+import { defaultGeneratorTemplate, selectedImageGeneratorTemplate, generationStepsForTemplate, loadDebugOptionsEnabled, loadGeneratorTemplateSettings, MINIMAX_H3_MODEL_TYPE, generatorModel, templateSupportsImages, subscribeDebugOptions, subscribeGeneratorTemplates, templateUsable, type GeneratorTemplate } from "../../lib/settings";import { isWorkActive, MAX_IMAGE_BATCH_COUNT, type WorkItem } from "../../lib/workQueue";import type { ConfigUpdate } from "./TimelineView";import { ReferenceImage } from "./ReferenceImage";@@ -59,7 +59,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGeneopenImage?: { id: string };onImageOpened?: () => void;}) {- const scene = useMemo(() => config.imageScene ?? createImageScene(config.brief.prompt), [config.imageScene, config.brief.prompt]);+ const scene = useMemo(() => config.imageScene ?? { ...createImageScene(config.brief.prompt), steps: selectedImageGeneratorTemplate().defaultSteps }, [config.imageScene, config.brief.prompt]);const settings = imageSettings(config);const root = scene.nodes.find((node) => node.kind === "root")!;const imageRoot = scene.rootType === "image";@@ -96,7 +96,7 @@ 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(() => localStorage.getItem("slopus.image-generator-template.v1") ?? defaultGeneratorTemplate().id);+ const [templateId, setTemplateId] = useState(() => selectedImageGeneratorTemplate().id);const imageTemplates = templates.templates.filter(templateSupportsImages);const template = imageTemplates.find((candidate) => candidate.id === templateId) ?? imageTemplates.find(templateUsable) ?? imageTemplates[0];const model = generatorModel(template?.modelType);@@ -266,7 +266,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene};const selectImage = (id: string) => {resetImageEditing(id);- attempt(() => onChange((current) => restoreGeneratedImage(current, id)));+ attempt(() => onChange((current) => restoreGeneratedImage(current, id, template?.defaultSteps)));};useEffect(() => {if (!openImage) return;@@ -282,7 +282,7 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGeneconst asset = current.assets.find((item) => item.id === id);if (!asset?.relativePath || asset.imageGeneration || current.imageScene?.outputAssetId !== id || current.imageScene.rootType === "image") return current;const next = { ...current, assets: current.assets.map((item) => item.id === id ? { ...item, ...size } : item) };- return restoreGeneratedImage(next, id);+ return restoreGeneratedImage(next, id, template?.defaultSteps);});});const createFromImage = (id: string, asScene: boolean) => {@@ -323,11 +323,11 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene: remaining[Math.min(currentImages.findIndex((asset) => asset.id === id), remaining.length - 1)];const updated = { ...current,assets: removeImageAsset(current.assets, id),- imageScene: removingSelected && removed.imageDraft && !next ? currentScene.rootType === "image" ? createImageEditScene(null, currentScene) : createImageScene() : { ...currentScene, outputAssetId: removingSelected ? next?.id ?? null : currentScene.outputAssetId },+ imageScene: removingSelected && removed.imageDraft && !next ? currentScene.rootType === "image" ? createImageEditScene(null, currentScene) : { ...createImageScene(), steps: template?.defaultSteps ?? 20 } : { ...currentScene, outputAssetId: removingSelected ? next?.id ?? null : currentScene.outputAssetId },thumbnail: removingSelected || current.thumbnail === removed.relativePath ? next?.relativePath ?? null : current.thumbnail,timeline: { ...current.timeline, tracks: current.timeline.tracks.map((track) => ({ ...track, clips: track.clips.filter((clip) => clip.assetId !== id) })) },};- return removingSelected && next ? restoreGeneratedImage(updated, next.id) : updated;+ return removingSelected && next ? restoreGeneratedImage(updated, next.id, template?.defaultSteps) : updated;});requestAnimationFrame(() => {const selectedButton = imageResults.current?.querySelector<HTMLButtonElement>('button[aria-pressed="true"]');@@ -716,11 +716,11 @@ export function ImageEditor({ config, folderPath, onChange: changeConfig, onGene...(imageMenu.source === "bar" ? [{ label: "New empty image", icon: <Add16 />, action: () => attempt(() => {undo.current = []; redo.current = []; pointer.current = null; setDraftBox(null); setDraftLasso(null); setDrawKind(null); setRenaming(null); setCollapsed(new Set()); setSelection("image-root");- onChange((current) => createEmptyImage(current, template?.id, imageMenu.inFamily ? imageMenu.id ?? current.imageScene?.outputAssetId : undefined));+ onChange((current) => createEmptyImage(current, template?.id, imageMenu.inFamily ? imageMenu.id ?? current.imageScene?.outputAssetId : undefined, template?.defaultSteps));}) },{ label: "Add image file", icon: <FolderOpen16 />, disabled: !isTauri(), action: () => attempt(async () => {const source = await invoke<ImageSource | null>("open_image_source", { folderPath });- if (source) replaceScene(createImageEditScene(source, scene));+ if (source) replaceScene({ ...createImageEditScene(source, scene), steps: template?.defaultSteps ?? 20 });}) },] : []),...(imageMenu.id ? [diff --git a/src/lib/imageHistory.ts b/src/lib/imageHistory.tsindex 8e39a49..42b8b46 100644--- a/src/lib/imageHistory.ts+++ b/src/lib/imageHistory.ts@@ -104,11 +104,11 @@ export function saveImageDraft(config: ProjectConfig, generatorTemplateId?: strireturn { ...config, imageScene: { ...scene, outputAssetId: id }, assets: existing ? config.assets.map((item) => item.id === id ? asset : item) : [...config.assets, asset] };}-export function createEmptyImage(config: ProjectConfig, generatorTemplateId?: string, familyAssetId?: string | null): ProjectConfig {+export function createEmptyImage(config: ProjectConfig, generatorTemplateId?: string, familyAssetId?: string | null, defaultSteps?: number): ProjectConfig {config = saveImageDraft(config);const parentAssetId = imageFamilyRoot(config.assets, familyAssetId);const id = `image-draft-${crypto.randomUUID()}`;- const scene = { ...createImageScene(), steps: config.imageScene?.steps ?? 20, outputAssetId: id };+ const scene = { ...createImageScene(), steps: defaultSteps ?? config.imageScene?.steps ?? 20, outputAssetId: id };const next = { ...config, imageScene: scene };const asset: ProjectAsset = { id, kind: "image", name: "New image", mimeType: "image/jpeg", imageDraft: true,...(parentAssetId ? { parentAssetId } : {}),@@ -139,7 +139,7 @@ export function completeImageDraft(config: ProjectConfig, id: string, result: Pr}/** Restore authored inputs without replacing other results or unrelated references. */-export function restoreGeneratedImage(config: ProjectConfig, id: string): ProjectConfig {+export function restoreGeneratedImage(config: ProjectConfig, id: string, defaultSteps = 20): ProjectConfig {const asset = config.assets.find((candidate) => candidate.id === id && candidate.kind === "image");if (!asset) return config;// Each image owns its inputs. Legacy imageEditing fields held a child's@@ -148,10 +148,10 @@ export function restoreGeneratedImage(config: ProjectConfig, id: string): Projecconst source = !snapshot && imageSourceSchema.safeParse(asset);if (source && source.success) {return { ...config, thumbnail: asset.relativePath ?? null,- imageScene: { ...createImageEditScene(source.data), outputAssetId: id } };+ imageScene: { ...createImageEditScene(source.data), steps: defaultSteps, outputAssetId: id } };}if (!snapshot) return { ...config, thumbnail: asset.relativePath ?? null,- imageScene: { ...createImageScene(), outputAssetId: id } };+ imageScene: { ...createImageScene(), steps: defaultSteps, outputAssetId: id } };const restored = structuredClone(snapshot);const scene = !asset.imageDraft && restored.scene.rootType === "image" && asset.relativePath && asset.width && asset.height? createImageEditScene({ relativePath: asset.relativePath, name: asset.name, width: asset.width, height: asset.height }, restored.scene)diff --git a/src/lib/persistence.ts b/src/lib/persistence.tsindex e686faa..1e417cd 100644--- a/src/lib/persistence.ts+++ b/src/lib/persistence.ts@@ -1,3 +1,4 @@+import { selectedImageGeneratorTemplate } from "./settings";import { invoke } from "@tauri-apps/api/core";import { addReferenceImageAssets } from "./referenceImageAssets";import {@@ -238,6 +239,7 @@ export async function readMediaFileBytes(folderPath: string, item: StoredLocatioexport async function createProject(input: CreateProjectInput): Promise<ProjectRecord | null> {const config = createProjectConfig(input);+ if (config.imageScene) config.imageScene.steps = selectedImageGeneratorTemplate().defaultSteps;if (isTauri()) {const value = await invoke<ProjectRecord | null>("create_project", {projectDirectory: input.projectDirectory ?? null,diff --git a/src/lib/settings.test.ts b/src/lib/settings.test.tsindex 0838c22..d015046 100644--- a/src/lib/settings.test.ts+++ b/src/lib/settings.test.ts@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it } from "vitest";import { TURBO_LORA, VIGGLE_ANIMATE_LORA, loadLoras, saveLoras } from "./loras";import {agentEndpointProviderSettings,- createGeneratorTemplate, mossImageTemplate, fiboImageTemplate, defaultGeneratorTemplate, generatorPathFields, templateSupportsVideo,+ selectedImageGeneratorTemplate, createGeneratorTemplate, mossImageTemplate, fiboImageTemplate, defaultGeneratorTemplate, generatorPathFields, templateSupportsVideo,engineProviderSetting,loadInferenceBackend,saveInferenceBackend,@@ -25,6 +25,24 @@ import {describe("generator templates", () => {beforeEach(() => localStorage.clear());+ it("starts image projects with the remembered Fibo generator's four-step default", async () => {+ const h3 = createGeneratorTemplate("Video"), fibo = createGeneratorTemplate("Fibo", "fibo2");+ saveGeneratorTemplateSettings({ templates: [h3, fibo], defaultTemplateId: h3.id, catalogVersion: 14 });+ localStorage.setItem("slopus.image-generator-template.v1", fibo.id);+ expect(selectedImageGeneratorTemplate().defaultSteps).toBe(4);+ const { createProject } = await import("./persistence");+ const record = await createProject({ name: "Fibo image", generationType: "image", prompt: "A blue vase", aspectRatio: "1:1", resolution: "768p", targetDurationSeconds: 10 });+ expect(record?.config.imageScene?.steps).toBe(4);+ });++ it("normalizes missing Fibo steps to four while retaining explicit custom defaults", () => {+ const fibo = fiboImageTemplate();+ localStorage.setItem("slopus.generator-templates.v1", JSON.stringify({ templates: [{ ...fibo, defaultSteps: undefined }], catalogVersion: 14 }));+ expect(loadGeneratorTemplateSettings().templates[0].defaultSteps).toBe(4);+ saveGeneratorTemplateSettings({ templates: [{ ...fibo, defaultSteps: 8 }], defaultTemplateId: "", catalogVersion: 14 });+ expect(loadGeneratorTemplateSettings().templates[0].defaultSteps).toBe(8);+ });+it("adds Fibo once without replacing custom settings or restoring a removed template", () => {const custom = createGeneratorTemplate("Custom");saveGeneratorTemplateSettings({ templates: [custom], defaultTemplateId: custom.id, catalogVersion: 13 });diff --git a/src/lib/settings.ts b/src/lib/settings.tsindex 86e039c..2d91a18 100644--- a/src/lib/settings.ts+++ b/src/lib/settings.ts@@ -354,7 +354,7 @@ const normalizeTemplateSettings = (value: unknown): GeneratorTemplateSettings |&& candidate.defaultSteps >= 2&& candidate.defaultSteps <= MAX_GENERATION_STEPS? candidate.defaultSteps- : DEFAULT_GENERATION_STEPS;+ : modelType === FIBO_MODEL_TYPE ? 4 : DEFAULT_GENERATION_STEPS;const attention = candidate.attention === "exact" || candidate.attention === "flash2" || candidate.attention === "sol" ? candidate.attention : "sage2";const paths = pathsFrom(candidate.paths);const sources: GeneratorTemplate["sources"] = {};@@ -604,13 +604,20 @@ export function saveGeneratorTemplateSettings(settings: GeneratorTemplateSettingqueueMicrotask(() => window.dispatchEvent(new Event(GENERATOR_TEMPLATES_EVENT)));}-export function defaultGeneratorTemplate(settings = loadGeneratorTemplateSettings(), medium?: "video"): GeneratorTemplate {- const eligible = settings.templates.filter((template) => medium !== "video" || templateSupportsVideo(template));+export function defaultGeneratorTemplate(settings = loadGeneratorTemplateSettings(), medium?: "video" | "image"): GeneratorTemplate {+ const eligible = settings.templates.filter((template) => medium === "video" ? templateSupportsVideo(template) : medium === "image" ? templateSupportsImages(template) : true);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) };}+/** 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");+}+export function loadDefaultGenerationSteps(): number {return defaultGeneratorTemplate().defaultSteps;}