Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

refactor: prepare image cleanup without loading render backends (#10709)

Adam Eivyabe71e4d35c5
diff --git a/server/lib/README.md b/server/lib/README.md
index 9cc0981664..f302a3ce6f 100644
--- a/server/lib/README.md
+++ b/server/lib/README.md
@@ -384,7 +384,7 @@ The barrel `server/lib/index.js` is a machine-checkable enumeration of every pub
| `forgeIssueCli.js` | Pure `gh`/`glab` issue-filing argument shapes and output parsing — `forgeLabelCreateArgs`, `forgeIssueCreateArgs`, `parseCreatedForgeIssue` — so the two CLIs' body-flag, label-attachment, and label-create disagreements have one definition. |
| `forgeIssueState.js` | `normalizeIssueState(state)` — collapse a forge issue/PR/MR state string to `open`/`closed`. GitHub reports `OPEN`/`CLOSED`; GitLab reports `opened`/`closed`/`locked`; anything unrecognized is treated as open so an unfamiliar state can never read as "already resolved". Shared by `layeredIntelligence/forgeFiler.js` and `services/blockedIssueReconcile.js`. |
| `imageClean.js` | `cleanImageBuffer(buf, { metadata, denoise })` (composable opt-in pipeline: lossless metadata/C2PA strip + optional median/sharpen denoise) · `stripPngMetadataChunks` / `stripPngC2PAChunk` (lossless PNG-chunk removers) · `compositeIgnoreZone(base, original, mask, { feather })` (preserve-region compositing: restore original pixels into a feathered mask over a diffused result) · `autoCleanGeneratedImage` (in-place clean for post-generation hook). HTTP route in `routes/imageClean.js` wraps `cleanImageBuffer` and appends a CPU light diffusion pass (`applyLightRegen` from `services/imageGen/regen.js`) for the `diffusion=light` SynthID-disruption step. |
-| `imageCleanDefaults.js` | `resolveCleanersFromConfig(modeCfg, mode)` — dependency-free, shared browser/server cleaner defaults; C2PA defaults on for codex/external, denoise stays opt-in. |
+| `imageCleanDefaults.js` | `resolveCleanersFromConfig(modeCfg, mode)` and `resolveImageCleaners(body, settings, mode)` — dependency-free saved defaults and request overrides; C2PA defaults on for codex/external, denoise stays opt-in. |
| `imageFrameStats.js` | Degenerate-frame classifier (#4173) — `describeFrameStats(bufferOrPath)` runs one `sharp` `.stats()` decode and returns `{ ok, reason, perChannel }`, rejecting `solid-fill` (every colour channel stdev under `SOLID_FILL_STDEV_EPSILON`), `fully-transparent` (alpha max 0) and `near-empty` (greyscale entropy under `NEAR_EMPTY_ENTROPY_FLOOR`), except when a non-opaque alpha channel carries a substantial silhouette itself. Deliberately NOT a quality judge: a legitimately dark or minimalist render keeps real per-channel variance and is accepted. `ok` is three-valued — `true`/`false`/`null`, where `null` means could-not-measure (undecodable buffer, or under `MIN_JUDGEABLE_PIXELS`) and must never read as degenerate; gate on `isDegenerateFrame(stats)` / `ok === false`, never `!ok`. Called by the Image Gen provider completion seams, sprite reference normalization, and `visionTest.js` (so a paid vision call is never spent on a blank frame). A **buffer** verdict is memoized on the sha256 of its bytes (#6004) — the probe costs ~4ms regardless of pixel count and the sprite compiler re-probes identical frames dozens of times per run; a **path** is never memoized (the file behind it can change), so hand it bytes you already read. `stats-unavailable` is never memoized either — that branch catches transient probe failures too, and pinning `ok: null` on valid bytes would disable the gate for them. `__resetFrameStatsCache()` drops the memo in tests. |
| `imageThumbnail.js` | Lazy, single-flight WebP previews for flat gallery PNG files, refreshed when the source changes. |
| `imageRgba.js` | Sharp-backed RGBA boundary: `decodeRgbaFrame` decodes an image to `{ data, width, height }`, and `encodePng` turns a raw frame into PNG bytes for the caller's destination/hash policy. |
diff --git a/server/lib/imageCleanDefaults.js b/server/lib/imageCleanDefaults.js
index c16616bc32..ae912c0d40 100644
--- a/server/lib/imageCleanDefaults.js
+++ b/server/lib/imageCleanDefaults.js
@@ -23,3 +23,16 @@ export function resolveCleanersFromConfig(modeCfg, mode) {
denoise: typeof cfg.denoise === 'boolean' ? cfg.denoise : false,
};
}
+
+// Resolve the cleaner flags from body overrides + saved per-mode settings.
+// Body fields win when explicit (per-render checkbox); otherwise inherit
+// the saved per-mode defaults via `resolveCleanersFromConfig`. Shared by
+// `/generate` and `generateImage()` (safety net for direct callers like
+// `generateAvatar`).
+export function resolveImageCleaners(body, settings, mode) {
+ const saved = resolveCleanersFromConfig(settings?.imageGen?.[mode], mode);
+ return {
+ cleanC2PA: typeof body?.cleanC2PA === 'boolean' ? body.cleanC2PA : saved.cleanC2PA,
+ denoise: typeof body?.denoise === 'boolean' ? body.denoise : saved.denoise,
+ };
+}
diff --git a/server/lib/importScoping.test.js b/server/lib/importScoping.test.js
index 8840c81ff4..80cf8c6bfb 100644
--- a/server/lib/importScoping.test.js
+++ b/server/lib/importScoping.test.js
@@ -45,6 +45,8 @@ const reaches = (entry, target) => staticImportClosure(abs(entry)).files.has(abs
// Each row: the entry that was narrowed, the module it must no longer
const NARROWED = [
+ ['services/imageGen/prepareParams.js', 'services/imageGen/index.js',
+ 'reads cleaner request policy without loading execution backends'],
['services/codeReview.js', 'lib/validation.js',
'reads reviewer vocabulary from its pure declaring module without the validation barrel'],
['services/backup.js', 'services/socket.js',
@@ -185,6 +187,8 @@ describe('narrowed imports stay narrow (#6009)', () => {
it('leaves the editorial barrel and the schema composer intact', () => {
expect(reaches('lib/editorial/checkRegistry.js', 'lib/editorial/checks/proseStyle.js')).toBe(true);
expect(reaches('lib/db/schema/index.js', 'lib/db/schema/catalog.js')).toBe(true);
+ expect(reaches('services/imageGen/index.js', 'services/imageGen/codex.js')).toBe(true);
+ expect(reaches('services/imageGen/prepareParams.js', 'lib/imageCleanDefaults.js')).toBe(true);
});
});
diff --git a/server/routes/imageGen.test.js b/server/routes/imageGen.test.js
index d1943f6378..7a79118c96 100644
--- a/server/routes/imageGen.test.js
+++ b/server/routes/imageGen.test.js
@@ -1,6 +1,6 @@
import { describe, it, expect, vi, beforeEach, afterEach, afterAll } from 'vitest';
import express from 'express';
-import { resolveCleanersFromConfig } from '../lib/imageCleanDefaults.js';
+import { resolveImageCleaners } from '../lib/imageCleanDefaults.js';
import { request as httpRequest } from 'node:http';
import { pinPlatform, request, startLoopbackServer, closeLoopbackServer } from '../lib/testHelper.js';
import { errorMiddleware } from '../lib/errorHandler.js';
@@ -74,16 +74,7 @@ vi.mock('../services/imageGen/index.js', () => ({
IMAGE_GEN_MODE: { EXTERNAL: 'external', LOCAL: 'local', CODEX: 'codex', GROK: 'grok', AGY: 'agy' },
IMAGE_GEN_MODES: ['external', 'local', 'codex', 'grok', 'agy'],
CLOUD_IMAGE_GEN_MODES: ['codex', 'grok', 'agy'],
- // Mirror the real precedence by delegating to the same helper the prod
- // resolver uses — keeps test mock and prod in lock-step automatically.
- // Legacy `autoClean: true` no longer carries into denoise (lossy, opt-in only).
- resolveImageCleaners: (body, settings, mode) => {
- const saved = resolveCleanersFromConfig(settings?.imageGen?.[mode], mode);
- return {
- cleanC2PA: typeof body?.cleanC2PA === 'boolean' ? body.cleanC2PA : saved.cleanC2PA,
- denoise: typeof body?.denoise === 'boolean' ? body.denoise : saved.denoise,
- };
- },
+ resolveImageCleaners,
local: {
listImageModels: vi.fn(() => []),
listLoraFilenames: vi.fn(async () => []),
diff --git a/server/services/README.md b/server/services/README.md
index 4af5e9edb0..ec023117af 100644
--- a/server/services/README.md
+++ b/server/services/README.md
@@ -14,7 +14,7 @@ image-generation paths below are useful entry points when tracing render jobs.
| `musicVideo/renderCancellation.js` | Shared capture-abort and ffmpeg kill selection for full/excerpt renders; records explicit cancellation before signaling and classifies nonzero closes without releasing ownership. |
| `musicVideo/sharingCopy.js` | Source-hashed private sharing MP4s: queued 720p H.264/AAC export, strict decimal 100 MB cap, supervised cancellation, verified download and owned-file cleanup. |
| `mediaJobQueue/index.js` | Owns admission, lanes, durability and terminal effects; `videoHolds.js` returns local-video cohort preparation results and owns circuit breakers, `recoverySettlement.js` names the transient recovery evidence and the maintenance-permit release decision, while `videoGen/modelSelection.js` owns model-selection policy. |
-| `imageGen/index.js` | Mode-aware image backend dispatcher and shared image-generation helpers. Direct queue consumers still resolve local model identity before enqueueing. |
+| `imageGen/index.js` | Mode-aware image backend execution dispatcher. Preparation uses `lib/imageCleanDefaults.js` for cleaner policy and resolves local model identity before enqueueing. |
| `superColliderRuntime.js` | Managed SuperCollider runtime I/O (#9412): Docker probe, recipe-hash-stamped image build, `runSuperColliderContainer` (contained `sclang` run with forced container removal), the synthetic render probe and its cached evidence, `getSuperColliderStatus` and idempotent `setupSuperColliderRuntime`. Never runs at boot. |
| `superColliderRender.js` | Contained SuperCollider renders (#9413): media-queue `supercollider` jobs that snapshot source into a job-private dir, run the trusted NRT wrapper via `runSuperColliderContainer` (output quota, timeout, cancel → container force-removed), validate the decoded WAV and publish a 24 h preview + provenance sidecar (`readSuperColliderPreview`). Sweeps orphaned containers/scratch before each render. |
| `universeBuilderRender.js` | Universe Builder batch render jobs. |
diff --git a/server/services/creativeDirector/firstPassGen.js b/server/services/creativeDirector/firstPassGen.js
index 0b3b851e48..d7d5155138 100644
--- a/server/services/creativeDirector/firstPassGen.js
+++ b/server/services/creativeDirector/firstPassGen.js
@@ -30,7 +30,7 @@
import { enqueueUnattendedMediaJob, hasConfiguredMediaRoute } from '../federatedMedia/defaultRouting.js';
import { getSettings } from '../settings.js';
-import { resolveImageCleaners } from '../imageGen/index.js';
+import { resolveImageCleaners } from '../../lib/imageCleanDefaults.js';
import { IMAGE_GEN_MODE } from '../imageGen/modes.js';
import { resolveRenderTargetConfig } from '../imageGen/cloudProviderConfig.js';
import { resolveLocalImageModel } from '../imageGen/prepareParams.js';
diff --git a/server/services/creativeDirector/firstPassGen.test.js b/server/services/creativeDirector/firstPassGen.test.js
index 2a7c750e59..cc3c27129d 100644
--- a/server/services/creativeDirector/firstPassGen.test.js
+++ b/server/services/creativeDirector/firstPassGen.test.js
@@ -17,7 +17,7 @@ vi.mock('../settings.js', () => ({
}
},
}));
-vi.mock('../imageGen/index.js', () => ({
+vi.mock('../../lib/imageCleanDefaults.js', () => ({
resolveImageCleaners: vi.fn(() => ({ cleanC2PA: true, denoise: false })),
}));
vi.mock('../imageGen/prepareParams.js', () => ({
diff --git a/server/services/deckRender.js b/server/services/deckRender.js
index 37ddbbdd35..760aebec73 100644
--- a/server/services/deckRender.js
+++ b/server/services/deckRender.js
@@ -43,7 +43,7 @@ export async function renderDeckCards(deckId, { cardIds, onlyMissing = false, mo
{ enqueueJob, assertMediaQueueRoom, partialBatchAdmissionError }, { getSettings }, { resolveRenderTargetConfig }, { resolveLocalImageModel }, { resolveImageCleaners },
] = await Promise.all([
import('./mediaJobQueue/index.js'), import('./settings.js'), import('./imageGen/cloudProviderConfig.js'),
- import('./imageGen/prepareParams.js'), import('./imageGen/index.js'),
+ import('./imageGen/prepareParams.js'), import('../lib/imageCleanDefaults.js'),
]);
const deck = await getDeck(deckId);
const targets = selectCardsToRender(deck.cards, { cardIds, onlyMissing });
diff --git a/server/services/deckRender.test.js b/server/services/deckRender.test.js
index a25a2a43bb..593d43b154 100644
--- a/server/services/deckRender.test.js
+++ b/server/services/deckRender.test.js
@@ -13,7 +13,7 @@ vi.mock('./mediaJobQueue/index.js', async () => ({
}));
vi.mock('./settings.js', () => ({ getSettings }));
vi.mock('./decks.js', () => ({ getDeck, markCardsRenderQueued }));
-vi.mock('./imageGen/index.js', () => ({ resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }) }));
+vi.mock('../lib/imageCleanDefaults.js', () => ({ resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }) }));
vi.mock('./imageGen/prepareParams.js', () => ({
resolveLocalImageModel,
}));
diff --git a/server/services/imageGen/index.js b/server/services/imageGen/index.js
index b4685b5164..35ab4a78b8 100644
--- a/server/services/imageGen/index.js
+++ b/server/services/imageGen/index.js
@@ -19,7 +19,7 @@ import { imageGenEvents } from '../imageGenEvents.js';
import { join } from 'path';
import { getSettings } from '../settings.js';
-import { resolveCleanersFromConfig } from '../../lib/imageClean.js';
+import { resolveImageCleaners } from '../../lib/imageCleanDefaults.js';
import * as external from './external.js';
import * as local from './local.js';
import * as codex from './codex.js';
@@ -94,18 +94,7 @@ async function checkLocalConnection(settings, modelIdOverride) {
};
}
-// Resolve the cleaner flags from body overrides + saved per-mode settings.
-// Body fields win when explicit (per-render checkbox); otherwise inherit
-// the saved per-mode defaults via `resolveCleanersFromConfig`. Shared by
-// `/generate` and `generateImage()` (safety net for direct callers like
-// `generateAvatar`).
-export function resolveImageCleaners(body, settings, mode) {
- const saved = resolveCleanersFromConfig(cfg(settings)[mode], mode);
- return {
- cleanC2PA: typeof body?.cleanC2PA === 'boolean' ? body.cleanC2PA : saved.cleanC2PA,
- denoise: typeof body?.denoise === 'boolean' ? body.denoise : saved.denoise,
- };
-}
+export { resolveImageCleaners };
export async function getMode() {
const s = await getSettings();
diff --git a/server/services/imageGen/prepareParams.js b/server/services/imageGen/prepareParams.js
index cc42a73208..c3075dc175 100644
--- a/server/services/imageGen/prepareParams.js
+++ b/server/services/imageGen/prepareParams.js
@@ -33,7 +33,7 @@ import { join } from 'node:path';
import { ServerError } from '../../lib/errorHandler.js';
import { PATHS, ensureDir, resolveGalleryImage, copyFileGuarded, unlinkGuarded } from '../../lib/fileUtils.js';
import { getSettings } from '../settings.js';
-import { resolveImageCleaners } from './index.js';
+import { resolveImageCleaners } from '../../lib/imageCleanDefaults.js';
import { IMAGE_GEN_MODE, LOCAL_IMAGEGEN_DEFAULT_MODEL, editIncapableModeError, isEditCapableMode, modeLabel } from './modes.js';
import {
cloudPromptRequired, maxInputImages, resolveCloudProviderConfig, resolveRenderTargetConfig,
diff --git a/server/services/imageGen/prepareParams.test.js b/server/services/imageGen/prepareParams.test.js
index 4fb45241dc..38196dca38 100644
--- a/server/services/imageGen/prepareParams.test.js
+++ b/server/services/imageGen/prepareParams.test.js
@@ -283,3 +283,20 @@ it('uses moodboard caption text on a backend without image-reference support', a
expect(data.prompt).toContain('fine silver grain');
expect(data.referenceImagePaths).toBeUndefined();
});
+
+// Pins cleaner precedence where requests are prepared, without loading a backend.
+describe('prepared image cleaner policy', () => {
+ it('inherits saved per-mode flags and accepts explicit boolean overrides', async () => {
+ getSettings.mockResolvedValue({ imageGen: { mode: 'external', external: { cleanC2PA: true, denoise: false } } });
+ expect((await run({ prompt: 'p' })).data).toMatchObject({ cleanC2PA: true, denoise: false });
+ expect((await run({ prompt: 'p', cleanC2PA: false, denoise: true })).data).toMatchObject({ cleanC2PA: false, denoise: true });
+ expect((await run({ prompt: 'p', cleanC2PA: 'false', denoise: null })).data).toMatchObject({ cleanC2PA: true, denoise: false });
+ });
+
+ it('defaults cleanup on only for emitting modes and never opts into denoise', async () => {
+ for (const mode of ['external', 'codex', 'grok']) {
+ getSettings.mockResolvedValue({ imageGen: { mode, codex: { enabled: true }, grok: { enabled: true } } });
+ expect((await run({ prompt: 'p' })).data).toMatchObject({ cleanC2PA: mode !== 'grok', denoise: false });
+ }
+ });
+});
diff --git a/server/services/loraDatasetGenerate.test.js b/server/services/loraDatasetGenerate.test.js
index 4dc7b9e1fc..a6bdee3f19 100644
--- a/server/services/loraDatasetGenerate.test.js
+++ b/server/services/loraDatasetGenerate.test.js
@@ -1,5 +1,9 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
+vi.mock('../lib/imageCleanDefaults.js', () => ({
+ resolveImageCleaners: vi.fn(() => ({ cleanC2PA: false, denoise: false })),
+}));
+
const renderMocks = vi.hoisted(() => ({
getSettings: vi.fn(),
enqueueJob: vi.fn(),
@@ -51,10 +55,6 @@ vi.mock('./mediaJobQueue/index.js', async () => ({
getJob: (...args) => renderMocks.getJob(...args),
mediaJobEvents: new (await import('node:events')).EventEmitter(),
}));
-vi.mock('./imageGen/index.js', () => ({
- IMAGE_GEN_MODE: { LOCAL: 'local', CODEX: 'codex', EXTERNAL: 'external' },
- resolveImageCleaners: vi.fn(() => ({ cleanC2PA: false, denoise: false })),
-}));
vi.mock('../lib/mediaModels.js', async (importOriginal) => ({
...(await importOriginal()),
getImageModels: (...args) => renderMocks.getImageModels(...args),
diff --git a/server/services/moodBoard/renderItem.js b/server/services/moodBoard/renderItem.js
index 3b3bc00450..1612a62c8f 100644
--- a/server/services/moodBoard/renderItem.js
+++ b/server/services/moodBoard/renderItem.js
@@ -45,7 +45,7 @@ function buildItemRenderPrompt(board, item) {
async function itemRenderParams(settings, { mode = null, model = null, target = null }, common) {
const [{ resolveRenderTargetConfig }, { resolveImageCleaners }, { resolveLocalImageModel }] = await Promise.all([
import('../imageGen/cloudProviderConfig.js'),
- import('../imageGen/index.js'),
+ import('../../lib/imageCleanDefaults.js'),
import('../imageGen/prepareParams.js'),
]);
const resolved = resolveRenderTargetConfig(settings, target, { mode, model, usableInstallFallback: true });
diff --git a/server/services/musicVideo/castAndSetsService.js b/server/services/musicVideo/castAndSetsService.js
index 5ef84f547f..55ac20f5fc 100644
--- a/server/services/musicVideo/castAndSetsService.js
+++ b/server/services/musicVideo/castAndSetsService.js
@@ -262,7 +262,7 @@ function referencePaths(stage, item) {
export async function imageJobParams(settings, route, common) {
const [{ resolveRenderTargetConfig }, { resolveImageCleaners }, { resolveLocalImageModel }] = await Promise.all([
import('../imageGen/cloudProviderConfig.js'),
- import('../imageGen/index.js'),
+ import('../../lib/imageCleanDefaults.js'),
import('../imageGen/prepareParams.js'),
]);
const resolved = resolveRenderTargetConfig(settings, RENDER_TARGET.MUSIC_VIDEO, { mode: route.mode, model: route.model });
diff --git a/server/services/musicVideo/productionDispatch.js b/server/services/musicVideo/productionDispatch.js
index 4fe1ab1609..413c9c1ae1 100644
--- a/server/services/musicVideo/productionDispatch.js
+++ b/server/services/musicVideo/productionDispatch.js
@@ -56,7 +56,7 @@ async function dispatchFrame({ project, scene, route, tag, settings }) {
.map((ref) => resolveGalleryImage(ref.imageId, { mustExist: false })).filter(Boolean);
const [{ resolveRenderTargetConfig }, { resolveImageCleaners }, { enqueueJob }] = await Promise.all([
import('../imageGen/cloudProviderConfig.js'),
- import('../imageGen/index.js'),
+ import('../../lib/imageCleanDefaults.js'),
import('../mediaJobQueue/index.js'),
]);
const resolved = resolveRenderTargetConfig(settings, RENDER_TARGET.MUSIC_VIDEO, { mode: route.mode, model: route.model });
diff --git a/server/services/musicVideo/productionDispatch.test.js b/server/services/musicVideo/productionDispatch.test.js
index 8fdafa667c..1fc44f5b49 100644
--- a/server/services/musicVideo/productionDispatch.test.js
+++ b/server/services/musicVideo/productionDispatch.test.js
@@ -17,7 +17,7 @@ vi.mock('../videoGen/submitJob.js', () => ({ submitVideoGenJob: (...a) => submit
vi.mock('./productionService.js', () => ({ assertProductionSubmission: vi.fn(async () => {}) }));
const assertRevisionOpen = vi.fn(async () => {});
vi.mock('./revisionService.js', () => ({ assertRevisionOpen: (...a) => assertRevisionOpen(...a) }));
-vi.mock('../imageGen/index.js', () => ({ resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }) }));
+vi.mock('../../lib/imageCleanDefaults.js', () => ({ resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }) }));
const { dispatchProductionStep } = await import('./productionDispatch.js');
const { assertProductionSubmission } = await import('./productionService.js');
diff --git a/server/services/pipeline/visualStageHelpers.js b/server/services/pipeline/visualStageHelpers.js
index 5c35296c0f..290283a2dc 100644
--- a/server/services/pipeline/visualStageHelpers.js
+++ b/server/services/pipeline/visualStageHelpers.js
@@ -25,7 +25,7 @@ import { IMAGE_GEN_MODE } from '../imageGen/modes.js';
import { resolveRenderTargetConfig } from '../imageGen/cloudProviderConfig.js';
import { imageModeCandidates, pickUsableMode } from '../../lib/renderModeLadder.js';
import { RENDER_TARGET, recordRenderPin } from '../../lib/renderTargets.js';
-import { resolveImageCleaners } from '../imageGen/index.js';
+import { resolveImageCleaners } from '../../lib/imageCleanDefaults.js';
import { selectLocalImageModelFromSettings } from '../imageGen/prepareParams.js';
const joinStyleParts = (...parts) =>
diff --git a/server/services/pipeline/visualStageHelpers.test.js b/server/services/pipeline/visualStageHelpers.test.js
index 94f3e354b1..ec96ea416d 100644
--- a/server/services/pipeline/visualStageHelpers.test.js
+++ b/server/services/pipeline/visualStageHelpers.test.js
@@ -18,7 +18,7 @@ vi.mock('../../lib/runners.js', () => ({ loraCompatKey: (...args) => mocks.loraC
vi.mock('../characterLoraResolver.js', () => ({
resolveCharacterLoras: (...args) => mocks.resolveCharacterLoras(...args),
}));
-vi.mock('../imageGen/index.js', () => ({
+vi.mock('../../lib/imageCleanDefaults.js', () => ({
resolveImageCleaners: vi.fn(() => ({ cleanC2PA: false, denoise: false })),
}));
diff --git a/server/services/sprites/assetPrompt.test.js b/server/services/sprites/assetPrompt.test.js
index fae6f12b24..a1b102d182 100644
--- a/server/services/sprites/assetPrompt.test.js
+++ b/server/services/sprites/assetPrompt.test.js
@@ -29,7 +29,7 @@ vi.mock('../mediaJobQueue/index.js', () => ({
enqueueJob: () => ({ jobId: 'job-x', position: 0, status: 'queued' }),
mediaJobEvents: { on: () => {}, off: () => {} },
}));
-vi.mock('../imageGen/index.js', () => ({
+vi.mock('../../lib/imageCleanDefaults.js', () => ({
resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }),
}));
vi.mock('../settings.js', () => ({ getSettings: async () => ({ imageGen: { mode: 'codex' } }) }));
diff --git a/server/services/sprites/atlas.test.js b/server/services/sprites/atlas.test.js
index 1245011168..71d68b775a 100644
--- a/server/services/sprites/atlas.test.js
+++ b/server/services/sprites/atlas.test.js
@@ -51,7 +51,7 @@ vi.mock('../../lib/fileUtils.js', async (importOriginal) => {
} };
});
-vi.mock('../imageGen/index.js', () => ({
+vi.mock('../../lib/imageCleanDefaults.js', () => ({
resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }),
}));
vi.mock('../settings.js', () => ({
diff --git a/server/services/sprites/reference.js b/server/services/sprites/reference.js
index b8a8f7a45a..cd5671b207 100644
--- a/server/services/sprites/reference.js
+++ b/server/services/sprites/reference.js
@@ -36,7 +36,7 @@ import { enqueueJob } from '../mediaJobQueue/index.js';
import {
IMAGE_GEN_MODE, resolveQueueImageMode,
} from '../imageGen/modes.js';
-import { resolveImageCleaners } from '../imageGen/index.js';
+import { resolveImageCleaners } from '../../lib/imageCleanDefaults.js';
import { resolveRenderTargetConfig } from '../imageGen/cloudProviderConfig.js';
import { selectLocalImageModelFromSettings } from '../imageGen/prepareParams.js';
import { imageModeCandidates, pickUsableMode } from '../../lib/renderModeLadder.js';
diff --git a/server/services/sprites/reference.test.js b/server/services/sprites/reference.test.js
index 5800a2674e..ad10b6d224 100644
--- a/server/services/sprites/reference.test.js
+++ b/server/services/sprites/reference.test.js
@@ -50,7 +50,7 @@ vi.mock('../mediaJobQueue/index.js', () => ({
mediaJobEvents: { on: () => {}, off: () => {} },
}));
-vi.mock('../imageGen/index.js', () => ({
+vi.mock('../../lib/imageCleanDefaults.js', () => ({
resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }),
}));
vi.mock('../../lib/mediaModels.js', async (importOriginal) => ({
diff --git a/server/services/sprites/spriteBackupAdmission.test.js b/server/services/sprites/spriteBackupAdmission.test.js
index 536d663e30..d4df35baef 100644
--- a/server/services/sprites/spriteBackupAdmission.test.js
+++ b/server/services/sprites/spriteBackupAdmission.test.js
@@ -44,7 +44,7 @@ vi.mock('../../lib/fileUtils.js', async (importOriginal) => {
const executeTuiRun = vi.fn(() => new Promise(() => {}));
vi.mock('../tuiPromptRunner.js', () => ({ executeTuiRun: (...args) => executeTuiRun(...args) }));
-vi.mock('../imageGen/index.js', () => ({ resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }) }));
+vi.mock('../../lib/imageCleanDefaults.js', () => ({ resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }) }));
vi.mock('../settings.js', () => ({
getSettings: async () => ({ imageGen: { mode: 'grok', grok: { enabled: true, grokPath: '/usr/local/bin/grok' } } }),
}));
diff --git a/server/services/sprites/walk.test.js b/server/services/sprites/walk.test.js
index eff0ba5e19..1dc49087e8 100644
--- a/server/services/sprites/walk.test.js
+++ b/server/services/sprites/walk.test.js
@@ -46,7 +46,7 @@ vi.mock('../tuiPromptRunner.js', () => ({
executeTuiRun: (...args) => executeTuiRun(...args),
}));
-vi.mock('../imageGen/index.js', () => ({
+vi.mock('../../lib/imageCleanDefaults.js', () => ({
resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }),
}));
diff --git a/server/services/universeBuilderRender.js b/server/services/universeBuilderRender.js
index 7d09dcbe7d..a072f69b02 100644
--- a/server/services/universeBuilderRender.js
+++ b/server/services/universeBuilderRender.js
@@ -20,7 +20,7 @@ import { IMAGE_GEN_MODE, QUEUEABLE_IMAGE_MODES } from './imageGen/modes.js';
import { resolveRenderTargetConfig } from './imageGen/cloudProviderConfig.js';
import { resolveLocalImageModel } from './imageGen/prepareParams.js';
import { RENDER_TARGET, recordRenderPin } from '../lib/renderTargets.js';
-import { resolveImageCleaners } from './imageGen/index.js';
+import { resolveImageCleaners } from '../lib/imageCleanDefaults.js';
import { getStylePresetById } from '../lib/writersRoomStylePresets.js';
import { ServerError } from '../lib/errorHandler.js';
diff --git a/server/services/universeBuilderRender.test.js b/server/services/universeBuilderRender.test.js
index c69bef899b..e475cdf70a 100644
--- a/server/services/universeBuilderRender.test.js
+++ b/server/services/universeBuilderRender.test.js
@@ -1,5 +1,9 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
+vi.mock('../lib/imageCleanDefaults.js', () => ({
+ resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }),
+}));
+
const mocks = vi.hoisted(() => ({
getUniverse: vi.fn(),
compilePrompts: vi.fn(),
@@ -31,10 +35,6 @@ vi.mock('./universeBuilderCollectionHook.js', () => ({
registerUniverseBuilderRun: (...args) => mocks.registerUniverseBuilderRun(...args),
shrinkUniverseBuilderRun: (...args) => mocks.shrinkUniverseBuilderRun(...args),
}));
-vi.mock('./imageGen/index.js', () => ({
- IMAGE_GEN_MODE: { LOCAL: 'local', EXTERNAL: 'external' },
- resolveImageCleaners: () => ({ cleanC2PA: false, denoise: false }),
-}));
vi.mock('../lib/mediaModels.js', async (importOriginal) => ({
...(await importOriginal()),
getImageModels: (...args) => mocks.getImageModels(...args),
diff --git a/server/services/universeCharacterSheet.modelResolution.test.js b/server/services/universeCharacterSheet.modelResolution.test.js
index 4ce517d678..fd4201f5b5 100644
--- a/server/services/universeCharacterSheet.modelResolution.test.js
+++ b/server/services/universeCharacterSheet.modelResolution.test.js
@@ -1,5 +1,9 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
+vi.mock('../lib/imageCleanDefaults.js', () => ({
+ resolveImageCleaners: vi.fn(() => ({ cleanC2PA: false, denoise: false })),
+}));
+
const mocks = vi.hoisted(() => ({
getUniverse: vi.fn(),
getSettings: vi.fn(),
@@ -21,10 +25,6 @@ vi.mock('./universeCharacterSheetSlot.js', () => ({
getPendingSheetSlot: vi.fn(),
releasePendingSheetSlot: vi.fn(),
}));
-vi.mock('./imageGen/index.js', () => ({
- IMAGE_GEN_MODE: { LOCAL: 'local', CODEX: 'codex', EXTERNAL: 'external' },
- resolveImageCleaners: vi.fn(() => ({ cleanC2PA: false, denoise: false })),
-}));
vi.mock('../lib/mediaModels.js', async (importOriginal) => ({
...(await importOriginal()),
getImageModels: (...args) => mocks.getImageModels(...args),
diff --git a/server/services/universeCharacterSheet.publication.test.js b/server/services/universeCharacterSheet.publication.test.js
index 46d44ac511..0e6fe905f4 100644
--- a/server/services/universeCharacterSheet.publication.test.js
+++ b/server/services/universeCharacterSheet.publication.test.js
@@ -1,5 +1,9 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
+vi.mock('../lib/imageCleanDefaults.js', () => ({
+ resolveImageCleaners: vi.fn(() => ({ cleanC2PA: false, denoise: false })),
+}));
+
const mocks = vi.hoisted(() => ({
getUniverse: vi.fn(),
getSettings: vi.fn(),
@@ -19,10 +23,6 @@ vi.mock('../lib/fileUtils.js', async importOriginal => ({
...(await importOriginal()), ensureDir: vi.fn(), copyFileGuarded: (...args) => mocks.copy(...args),
}));
vi.mock('./universeRunTag.js', () => ({ buildUniverseRunTag: (...args) => mocks.buildUniverseRunTag(...args) }));
-vi.mock('./imageGen/index.js', () => ({
- IMAGE_GEN_MODE: { LOCAL: 'local', CODEX: 'codex', EXTERNAL: 'external' },
- resolveImageCleaners: vi.fn(() => ({ cleanC2PA: false, denoise: false })),
-}));
vi.mock('../lib/mediaModels.js', async (importOriginal) => ({
...(await importOriginal()),
getImageModels: (...args) => mocks.getImageModels(...args),