ima2-gen 1.1.7 → 1.1.9

package/bin/lib/storage-doctor.js

@@ -1,38 +1,37 @@
 import { inspectGeneratedStorage } from "../../lib/storageMigration.js";
-
 export async function buildStorageDoctorLines(ctx) {
-  const status = await inspectGeneratedStorage(ctx);
-  const lines = [
-    "  Storage",
-    `    Current gallery: ${status.generatedDirLabel}`,
-    `    Source: ${status.overrides.generatedDir ? "IMA2_GENERATED_DIR" : "default"}`,
-    `    Images in current gallery: ${status.targetFileCount}`,
-    `    Legacy folders scanned: ${status.legacyCandidatesScanned}`,
-    `    Legacy folders found: ${status.legacySourcesFound}`,
-  ];
-
-  for (const source of status.legacySources.slice(0, 5)) {
-    lines.push(`      - ${source.path} (${source.fileCount} files)`);
-  }
-  if (status.legacySources.length > 5) {
-    lines.push(`      ...and ${status.legacySources.length - 5} more`);
-  }
-
-  lines.push("");
-  lines.push("  Next step");
-  if (status.state === "recoverable") {
-    lines.push("    Old images may still be recoverable. Restart ima2 or copy them manually.");
-  } else if (status.state === "not_found") {
-    lines.push("    No previous generated folder was found on this machine.");
-    lines.push("    If the old global install folder was replaced during update, backups may be required.");
-  } else if (status.state === "unknown") {
-    lines.push("    Storage status could not be fully checked.");
-  } else {
-    lines.push("    Current gallery storage looks available.");
-  }
-  lines.push(`    See: ${status.recoveryDocsPath}`);
-  lines.push("    macOS/Linux: cp -n \"/old/ima2-gen/generated/\"* ~/.ima2/generated/");
-  lines.push("    Windows: Copy old generated files into %USERPROFILE%\\.ima2\\generated");
-
-  return lines;
+    const status = await inspectGeneratedStorage(ctx);
+    const lines = [
+        "  Storage",
+        `    Current gallery: ${status.generatedDirLabel}`,
+        `    Source: ${status.overrides.generatedDir ? "IMA2_GENERATED_DIR" : "default"}`,
+        `    Images in current gallery: ${status.targetFileCount}`,
+        `    Legacy folders scanned: ${status.legacyCandidatesScanned}`,
+        `    Legacy folders found: ${status.legacySourcesFound}`,
+    ];
+    for (const source of status.legacySources.slice(0, 5)) {
+        lines.push(`      - ${source.path} (${source.fileCount} files)`);
+    }
+    if (status.legacySources.length > 5) {
+        lines.push(`      ...and ${status.legacySources.length - 5} more`);
+    }
+    lines.push("");
+    lines.push("  Next step");
+    if (status.state === "recoverable") {
+        lines.push("    Old images may still be recoverable. Restart ima2 or copy them manually.");
+    }
+    else if (status.state === "not_found") {
+        lines.push("    No previous generated folder was found on this machine.");
+        lines.push("    If the old global install folder was replaced during update, backups may be required.");
+    }
+    else if (status.state === "unknown") {
+        lines.push("    Storage status could not be fully checked.");
+    }
+    else {
+        lines.push("    Current gallery storage looks available.");
+    }
+    lines.push(`    See: ${status.recoveryDocsPath}`);
+    lines.push("    macOS/Linux: cp -n \"/old/ima2-gen/generated/\"* ~/.ima2/generated/");
+    lines.push("    Windows: Copy old generated files into %USERPROFILE%\\.ima2\\generated");
+    return lines;
 }

package/bin/lib/storage-doctor.ts

@@ -0,0 +1,38 @@
+import { inspectGeneratedStorage } from "../../lib/storageMigration.js";
+
+export async function buildStorageDoctorLines(ctx) {
+  const status = await inspectGeneratedStorage(ctx);
+  const lines = [
+    "  Storage",
+    `    Current gallery: ${status.generatedDirLabel}`,
+    `    Source: ${status.overrides.generatedDir ? "IMA2_GENERATED_DIR" : "default"}`,
+    `    Images in current gallery: ${status.targetFileCount}`,
+    `    Legacy folders scanned: ${status.legacyCandidatesScanned}`,
+    `    Legacy folders found: ${status.legacySourcesFound}`,
+  ];
+
+  for (const source of status.legacySources.slice(0, 5)) {
+    lines.push(`      - ${source.path} (${source.fileCount} files)`);
+  }
+  if (status.legacySources.length > 5) {
+    lines.push(`      ...and ${status.legacySources.length - 5} more`);
+  }
+
+  lines.push("");
+  lines.push("  Next step");
+  if (status.state === "recoverable") {
+    lines.push("    Old images may still be recoverable. Restart ima2 or copy them manually.");
+  } else if (status.state === "not_found") {
+    lines.push("    No previous generated folder was found on this machine.");
+    lines.push("    If the old global install folder was replaced during update, backups may be required.");
+  } else if (status.state === "unknown") {
+    lines.push("    Storage status could not be fully checked.");
+  } else {
+    lines.push("    Current gallery storage looks available.");
+  }
+  lines.push(`    See: ${status.recoveryDocsPath}`);
+  lines.push("    macOS/Linux: cp -n \"/old/ima2-gen/generated/\"* ~/.ima2/generated/");
+  lines.push("    Windows: Copy old generated files into %USERPROFILE%\\.ima2\\generated");
+
+  return lines;
+}

package/config.js

@@ -10,225 +10,182 @@
 //
 // Keep this module dependency-free aside from node:* built-ins to avoid
 // circular imports with lib/*.
-
 import { homedir } from "node:os";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { readFileSync, existsSync } from "node:fs";
-
 const env = process.env;
 const packageRoot = dirname(fileURLToPath(import.meta.url));
 const configDir = env.IMA2_CONFIG_DIR || join(homedir(), ".ima2");
-
 // ── Optional config.json layer ─────────────────────────────────────────
 // Users can drop `${configDir}/config.json` to override defaults without
 // setting env vars. Shape: same as the `config` object below (partial).
 function loadConfigJson() {
-  const candidates = [
-    join(configDir, "config.json"),
-    join(packageRoot, ".ima2", "config.json"),
-  ];
-  for (const p of candidates) {
-    if (!existsSync(p)) continue;
-    try {
-      const raw = readFileSync(p, "utf-8");
-      return JSON.parse(raw);
-    } catch {
-      // ignore malformed config.json; env+defaults still apply
+    const candidates = [
+        join(configDir, "config.json"),
+        join(packageRoot, ".ima2", "config.json"),
+    ];
+    for (const p of candidates) {
+        if (!existsSync(p))
+            continue;
+        try {
+            const raw = readFileSync(p, "utf-8");
+            return JSON.parse(raw);
+        }
+        catch {
+            // ignore malformed config.json; env+defaults still apply
+        }
     }
-  }
-  return {};
+    return {};
 }
 const fileCfg = loadConfigJson();
-
 function firstDefined(...vals) {
-  return vals.find((v) => v !== undefined && v !== "");
+    return vals.find((v) => v !== undefined && v !== "");
 }
 function pickInt(envVal, fileVal, fallback) {
-  const candidate = firstDefined(envVal, fileVal);
-  if (candidate === undefined) return fallback;
-  const n = Number(candidate);
-  return Number.isFinite(n) ? n : fallback;
+    const candidate = firstDefined(envVal, fileVal);
+    if (candidate === undefined)
+        return fallback;
+    const n = Number(candidate);
+    return Number.isFinite(n) ? n : fallback;
 }
 function pickPositiveInt(envVal, fileVal, fallback) {
-  const n = pickInt(envVal, fileVal, fallback);
-  return Number.isFinite(n) && n > 0 ? n : fallback;
+    const n = pickInt(envVal, fileVal, fallback);
+    return Number.isFinite(n) && n > 0 ? n : fallback;
 }
 function pickStr(envVal, fileVal, fallback) {
-  return firstDefined(envVal, fileVal) ?? fallback;
+    return firstDefined(envVal, fileVal) ?? fallback;
 }
 function pickBool(envVal, fileVal, fallback) {
-  const v = firstDefined(envVal, fileVal);
-  if (v === undefined) return fallback;
-  if (typeof v === "boolean") return v;
-  const s = String(v).toLowerCase();
-  return s === "1" || s === "true" || s === "yes";
+    const v = firstDefined(envVal, fileVal);
+    if (v === undefined)
+        return fallback;
+    if (typeof v === "boolean")
+        return v;
+    const s = String(v).toLowerCase();
+    return s === "1" || s === "true" || s === "yes";
 }
-
 export function defaultLogLevelForEnv(runtimeEnv = env) {
-  return runtimeEnv.IMA2_DEV === "1" ? "debug" : "info";
+    return runtimeEnv.IMA2_DEV === "1" ? "debug" : "info";
 }
-
 export const config = {
-  server: {
-    // Accept both IMA2_PORT and legacy PORT.
-    port: pickInt(firstDefined(env.IMA2_PORT, env.PORT), fileCfg.server?.port, 3333),
-    host: pickStr(env.IMA2_HOST, fileCfg.server?.host, "127.0.0.1"),
-    bodyLimit: pickStr(env.IMA2_BODY_LIMIT, fileCfg.server?.bodyLimit, "50mb"),
-  },
-  limits: {
-    maxRefB64Bytes: pickInt(env.IMA2_MAX_REF_B64_BYTES, fileCfg.limits?.maxRefB64Bytes, 7 * 1024 * 1024),
-    maxMetadataReadB64Bytes: pickInt(
-      env.IMA2_MAX_METADATA_READ_B64_BYTES,
-      fileCfg.limits?.maxMetadataReadB64Bytes,
-      12 * 1024 * 1024,
-    ),
-    maxRefCount: pickInt(env.IMA2_MAX_REF_COUNT, fileCfg.limits?.maxRefCount, 5),
-    maxParallel: pickInt(env.IMA2_MAX_PARALLEL, fileCfg.limits?.maxParallel, 8),
-    graphMaxNodes: pickInt(env.IMA2_GRAPH_MAX_NODES, fileCfg.limits?.graphMaxNodes, 500),
-    graphMaxEdges: pickInt(env.IMA2_GRAPH_MAX_EDGES, fileCfg.limits?.graphMaxEdges, 1000),
-    promptImportMaxFileBytes: pickInt(
-      env.IMA2_PROMPT_IMPORT_MAX_FILE_BYTES,
-      fileCfg.limits?.promptImportMaxFileBytes,
-      512 * 1024,
-    ),
-    promptImportMaxCandidatesPerFile: pickInt(
-      env.IMA2_PROMPT_IMPORT_MAX_CANDIDATES_PER_FILE,
-      fileCfg.limits?.promptImportMaxCandidatesPerFile,
-      100,
-    ),
-    promptImportMaxCandidatesPerImport: pickInt(
-      env.IMA2_PROMPT_IMPORT_MAX_CANDIDATES_PER_IMPORT,
-      fileCfg.limits?.promptImportMaxCandidatesPerImport,
-      100,
-    ),
-    promptImportFetchTimeoutMs: pickInt(
-      env.IMA2_PROMPT_IMPORT_FETCH_TIMEOUT_MS,
-      fileCfg.limits?.promptImportFetchTimeoutMs,
-      8000,
-    ),
-    promptImportMaxCandidateChars: pickInt(
-      env.IMA2_PROMPT_IMPORT_MAX_CANDIDATE_CHARS,
-      fileCfg.limits?.promptImportMaxCandidateChars,
-      12000,
-    ),
-    promptImportMinCandidateChars: pickInt(
-      env.IMA2_PROMPT_IMPORT_MIN_CANDIDATE_CHARS,
-      fileCfg.limits?.promptImportMinCandidateChars,
-      40,
-    ),
-    promptImportMaxSourceCharsScanned: pickInt(
-      env.IMA2_PROMPT_IMPORT_MAX_SOURCE_CHARS_SCANNED,
-      fileCfg.limits?.promptImportMaxSourceCharsScanned,
-      512 * 1024,
-    ),
-  },
-  history: {
-    defaultPageSize: pickInt(
-      env.IMA2_HISTORY_PAGE_SIZE,
-      fileCfg.history?.defaultPageSize ?? fileCfg.limits?.historyDefaultPageSize,
-      50,
-    ),
-    maxPageCap: pickInt(
-      env.IMA2_HISTORY_MAX_PAGE,
-      fileCfg.history?.maxPageCap ?? fileCfg.limits?.historyMaxPageCap,
-      500,
-    ),
-  },
-  oauth: {
-    // Accept both IMA2_OAUTH_PROXY_PORT and legacy OAUTH_PORT.
-    proxyPort: pickInt(firstDefined(env.IMA2_OAUTH_PROXY_PORT, env.OAUTH_PORT), fileCfg.oauth?.proxyPort, 10531),
-    // IMA2_NO_OAUTH_PROXY=1 disables auto-start; default is auto-start enabled.
-    autoStart: !pickBool(env.IMA2_NO_OAUTH_PROXY, fileCfg.oauth?.disableAutoStart, false),
-    statusTimeoutMs: pickInt(env.IMA2_OAUTH_STATUS_TIMEOUT_MS, fileCfg.oauth?.statusTimeoutMs, 3000),
-    restartDelayMs: pickInt(env.IMA2_OAUTH_RESTART_DELAY_MS, fileCfg.oauth?.restartDelayMs, 5000),
-    researchSuffix: pickStr(
-      env.IMA2_RESEARCH_SUFFIX,
-      fileCfg.oauth?.researchSuffix,
-      "\n\nIf the subject matter requires factual accuracy (faces, products, places, recent events), search the web for accurate visual references first, then generate.",
-    ),
-    validModeration: new Set(
-      Array.isArray(fileCfg.oauth?.validModeration) && fileCfg.oauth.validModeration.length
-        ? fileCfg.oauth.validModeration
-        : ["auto", "low"],
-    ),
-  },
-  storage: {
-    configDir,
-    packageRoot,
-    generatedDir: pickStr(env.IMA2_GENERATED_DIR, fileCfg.storage?.generatedDir, join(configDir, "generated")),
-    trashDir: pickStr(env.IMA2_TRASH_DIR, fileCfg.storage?.trashDir, join(configDir, "generated", ".trash")),
-    generatedDirName: pickStr(env.IMA2_GENERATED_DIRNAME, fileCfg.storage?.generatedDirName, "generated"),
-    trashDirName: pickStr(env.IMA2_TRASH_DIRNAME, fileCfg.storage?.trashDirName, ".trash"),
-    dbPath: pickStr(env.IMA2_DB_PATH, fileCfg.storage?.dbPath, join(configDir, "sessions.db")),
-    configFile: join(configDir, "config.json"),
-    advertiseFile: pickStr(env.IMA2_ADVERTISE_FILE, fileCfg.storage?.advertiseFile, join(configDir, "server.json")),
-    staticMaxAge: pickStr(env.IMA2_STATIC_MAX_AGE, fileCfg.storage?.staticMaxAge, "1y"),
-  },
-  ids: {
-    generatedHexBytes: pickInt(env.IMA2_GENERATED_HEX_BYTES, fileCfg.ids?.generatedHexBytes, 4),
-    nodeHexBytes: pickInt(env.IMA2_NODE_HEX_BYTES, fileCfg.ids?.nodeHexBytes, 5),
-  },
-  inflight: {
-    ttlMs: pickInt(env.IMA2_INFLIGHT_TTL_MS, fileCfg.inflight?.ttlMs, 10 * 60 * 1000),
-    reapMs: pickInt(env.IMA2_INFLIGHT_REAP_MS, fileCfg.inflight?.reapMs, 60 * 1000),
-    terminalTtlMs: pickInt(env.IMA2_INFLIGHT_TERMINAL_TTL_MS, fileCfg.inflight?.terminalTtlMs, 30 * 1000),
-  },
-  trash: {
-    ttlMs: pickInt(env.IMA2_TRASH_TTL_MS, fileCfg.trash?.ttlMs, 10_000),
-  },
-  styleSheet: {
-    maxPrefix: pickInt(env.IMA2_STYLE_SHEET_MAX_PREFIX, fileCfg.styleSheet?.maxPrefix, 4000),
-    model: pickStr(env.IMA2_STYLE_MODEL, fileCfg.styleSheet?.model, "gpt-5.4-mini"),
-  },
-  imageModels: {
-    default: pickStr(env.IMA2_IMAGE_MODEL_DEFAULT, fileCfg.imageModels?.default, "gpt-5.4-mini"),
-    valid: new Set(["gpt-5.5", "gpt-5.4", "gpt-5.4-mini"]),
-    unsupported: new Set(["gpt-5.3-codex-spark"]),
-    reasoningEffort: pickStr(
-      env.IMA2_REASONING_EFFORT,
-      fileCfg.imageModels?.reasoningEffort,
-      "medium",
-    ),
-    validReasoningEfforts: new Set(["low", "medium", "high", "xhigh"]),
-  },
-  log: {
-    level: pickStr(env.IMA2_LOG_LEVEL, fileCfg.log?.level, defaultLogLevelForEnv(env)),
-    pretty: env.NODE_ENV !== "production",
-  },
-  features: {
-    cardNews: pickBool(env.IMA2_CARD_NEWS, fileCfg.features?.cardNews, env.IMA2_DEV === "1"),
-  },
-  cardNewsPlanner: {
-    enabled: pickBool(env.IMA2_CARD_NEWS_PLANNER, fileCfg.cardNewsPlanner?.enabled, true),
-    model: pickStr(env.IMA2_CARD_NEWS_PLANNER_MODEL, fileCfg.cardNewsPlanner?.model, "gpt-5.4-mini"),
-    timeoutMs: pickInt(env.IMA2_CARD_NEWS_PLANNER_TIMEOUT_MS, fileCfg.cardNewsPlanner?.timeoutMs, 60_000),
-    deterministicFallback: pickBool(
-      env.IMA2_CARD_NEWS_PLANNER_FALLBACK,
-      fileCfg.cardNewsPlanner?.deterministicFallback,
-      false,
-    ),
-  },
-  comfy: {
-    defaultUrl: pickStr(env.IMA2_COMFY_URL, fileCfg.comfy?.defaultUrl, "http://127.0.0.1:8188"),
-    uploadTimeoutMs: pickPositiveInt(
-      env.IMA2_COMFY_UPLOAD_TIMEOUT_MS,
-      fileCfg.comfy?.uploadTimeoutMs,
-      30_000,
-    ),
-    maxUploadBytes: pickPositiveInt(
-      env.IMA2_COMFY_MAX_UPLOAD_BYTES,
-      fileCfg.comfy?.maxUploadBytes,
-      50 * 1024 * 1024,
-    ),
-  },
-  dev: {
-    viteDevMode: pickBool(env.VITE_IMA2_DEV, fileCfg.dev?.viteDevMode, false),
-  },
+    server: {
+        // Accept both IMA2_PORT and legacy PORT.
+        port: pickInt(firstDefined(env.IMA2_PORT, env.PORT), fileCfg.server?.port, 3333),
+        host: pickStr(env.IMA2_HOST, fileCfg.server?.host, "127.0.0.1"),
+        bodyLimit: pickStr(env.IMA2_BODY_LIMIT, fileCfg.server?.bodyLimit, "50mb"),
+    },
+    limits: {
+        maxRefB64Bytes: pickInt(env.IMA2_MAX_REF_B64_BYTES, fileCfg.limits?.maxRefB64Bytes, 7 * 1024 * 1024),
+        maxMetadataReadB64Bytes: pickInt(env.IMA2_MAX_METADATA_READ_B64_BYTES, fileCfg.limits?.maxMetadataReadB64Bytes, 12 * 1024 * 1024),
+        maxRefCount: pickInt(env.IMA2_MAX_REF_COUNT, fileCfg.limits?.maxRefCount, 5),
+        maxParallel: pickInt(env.IMA2_MAX_PARALLEL, fileCfg.limits?.maxParallel, 8),
+        graphMaxNodes: pickInt(env.IMA2_GRAPH_MAX_NODES, fileCfg.limits?.graphMaxNodes, 500),
+        graphMaxEdges: pickInt(env.IMA2_GRAPH_MAX_EDGES, fileCfg.limits?.graphMaxEdges, 1000),
+        promptImportMaxFileBytes: pickInt(env.IMA2_PROMPT_IMPORT_MAX_FILE_BYTES, fileCfg.limits?.promptImportMaxFileBytes, 512 * 1024),
+        promptImportMaxCandidatesPerFile: pickInt(env.IMA2_PROMPT_IMPORT_MAX_CANDIDATES_PER_FILE, fileCfg.limits?.promptImportMaxCandidatesPerFile, 100),
+        promptImportMaxCandidatesPerImport: pickInt(env.IMA2_PROMPT_IMPORT_MAX_CANDIDATES_PER_IMPORT, fileCfg.limits?.promptImportMaxCandidatesPerImport, 100),
+        promptImportFetchTimeoutMs: pickInt(env.IMA2_PROMPT_IMPORT_FETCH_TIMEOUT_MS, fileCfg.limits?.promptImportFetchTimeoutMs, 8000),
+        promptImportMaxCandidateChars: pickInt(env.IMA2_PROMPT_IMPORT_MAX_CANDIDATE_CHARS, fileCfg.limits?.promptImportMaxCandidateChars, 12000),
+        promptImportMinCandidateChars: pickInt(env.IMA2_PROMPT_IMPORT_MIN_CANDIDATE_CHARS, fileCfg.limits?.promptImportMinCandidateChars, 40),
+        promptImportMaxSourceCharsScanned: pickInt(env.IMA2_PROMPT_IMPORT_MAX_SOURCE_CHARS_SCANNED, fileCfg.limits?.promptImportMaxSourceCharsScanned, 512 * 1024),
+        promptImportMaxRepoIndexFiles: pickInt(env.IMA2_PROMPT_IMPORT_MAX_REPO_INDEX_FILES, fileCfg.limits?.promptImportMaxRepoIndexFiles, 500),
+        promptImportCuratedSearchLimit: pickInt(env.IMA2_PROMPT_IMPORT_CURATED_SEARCH_LIMIT, fileCfg.limits?.promptImportCuratedSearchLimit, 50),
+        promptImportIndexCacheTtlMs: pickInt(env.IMA2_PROMPT_IMPORT_INDEX_CACHE_TTL_MS, fileCfg.limits?.promptImportIndexCacheTtlMs, 24 * 60 * 60 * 1000),
+        promptImportMaxFolderFiles: pickInt(env.IMA2_PROMPT_IMPORT_MAX_FOLDER_FILES, fileCfg.limits?.promptImportMaxFolderFiles, 100),
+        promptImportMaxFolderPreviewFiles: pickInt(env.IMA2_PROMPT_IMPORT_MAX_FOLDER_PREVIEW_FILES, fileCfg.limits?.promptImportMaxFolderPreviewFiles, 20),
+        promptImportDiscoverySearchLimit: pickInt(env.IMA2_PROMPT_IMPORT_DISCOVERY_SEARCH_LIMIT, fileCfg.limits?.promptImportDiscoverySearchLimit, 20),
+        promptImportDiscoveryCacheTtlMs: pickInt(env.IMA2_PROMPT_IMPORT_DISCOVERY_CACHE_TTL_MS, fileCfg.limits?.promptImportDiscoveryCacheTtlMs, 60 * 60 * 1000),
+        promptImportDiscoveryMaxQueries: pickInt(env.IMA2_PROMPT_IMPORT_DISCOVERY_MAX_QUERIES, fileCfg.limits?.promptImportDiscoveryMaxQueries, 5),
+    },
+    history: {
+        defaultPageSize: pickInt(env.IMA2_HISTORY_PAGE_SIZE, fileCfg.history?.defaultPageSize ?? fileCfg.limits?.historyDefaultPageSize, 50),
+        maxPageCap: pickInt(env.IMA2_HISTORY_MAX_PAGE, fileCfg.history?.maxPageCap ?? fileCfg.limits?.historyMaxPageCap, 500),
+    },
+    oauth: {
+        // Accept both IMA2_OAUTH_PROXY_PORT and legacy OAUTH_PORT.
+        proxyPort: pickInt(firstDefined(env.IMA2_OAUTH_PROXY_PORT, env.OAUTH_PORT), fileCfg.oauth?.proxyPort, 10531),
+        // IMA2_NO_OAUTH_PROXY=1 disables auto-start; default is auto-start enabled.
+        autoStart: !pickBool(env.IMA2_NO_OAUTH_PROXY, fileCfg.oauth?.disableAutoStart, false),
+        statusTimeoutMs: pickInt(env.IMA2_OAUTH_STATUS_TIMEOUT_MS, fileCfg.oauth?.statusTimeoutMs, 3000),
+        generationTimeoutMs: pickInt(env.IMA2_OAUTH_GENERATION_TIMEOUT_MS, fileCfg.oauth?.generationTimeoutMs, 400 * 1000),
+        restartDelayMs: pickInt(env.IMA2_OAUTH_RESTART_DELAY_MS, fileCfg.oauth?.restartDelayMs, 5000),
+        // Provider-backed masked edit is off until upstream STEP-0 verification is recorded.
+        maskedEditEnabled: pickBool(env.IMA2_OAUTH_MASKED_EDIT_ENABLED, fileCfg.oauth?.maskedEditEnabled, false),
+        researchSuffix: pickStr(env.IMA2_RESEARCH_SUFFIX, fileCfg.oauth?.researchSuffix, "\n\nIf factual visual accuracy is required and the user's prompt or attached visual context is not already sufficient, use at least one concise web_search call for references before generating. If the user's prompt is already visually sufficient, do not search, rewrite, translate, summarize, or add clarifiers; pass the user's prompt through as the image_generation prompt argument."),
+        validModeration: new Set(Array.isArray(fileCfg.oauth?.validModeration) && fileCfg.oauth.validModeration.length
+            ? fileCfg.oauth.validModeration
+            : ["auto", "low"]),
+    },
+    github: {
+        token: pickStr(env.IMA2_GITHUB_TOKEN, fileCfg.github?.token, ""),
+    },
+    storage: {
+        configDir,
+        packageRoot,
+        generatedDir: pickStr(env.IMA2_GENERATED_DIR, fileCfg.storage?.generatedDir, join(configDir, "generated")),
+        trashDir: pickStr(env.IMA2_TRASH_DIR, fileCfg.storage?.trashDir, join(configDir, "generated", ".trash")),
+        generatedDirName: pickStr(env.IMA2_GENERATED_DIRNAME, fileCfg.storage?.generatedDirName, "generated"),
+        trashDirName: pickStr(env.IMA2_TRASH_DIRNAME, fileCfg.storage?.trashDirName, ".trash"),
+        dbPath: pickStr(env.IMA2_DB_PATH, fileCfg.storage?.dbPath, join(configDir, "sessions.db")),
+        promptImportIndexCacheFile: pickStr(env.IMA2_PROMPT_IMPORT_INDEX_CACHE_FILE, fileCfg.storage?.promptImportIndexCacheFile, join(configDir, "prompt-import-index.json")),
+        promptImportDiscoveryRegistryFile: pickStr(env.IMA2_PROMPT_IMPORT_DISCOVERY_REGISTRY_FILE, fileCfg.storage?.promptImportDiscoveryRegistryFile, join(configDir, "prompt-import-discovery.json")),
+        configFile: join(configDir, "config.json"),
+        advertiseFile: pickStr(env.IMA2_ADVERTISE_FILE, fileCfg.storage?.advertiseFile, join(configDir, "server.json")),
+        staticMaxAge: pickStr(env.IMA2_STATIC_MAX_AGE, fileCfg.storage?.staticMaxAge, "1y"),
+    },
+    ids: {
+        generatedHexBytes: pickInt(env.IMA2_GENERATED_HEX_BYTES, fileCfg.ids?.generatedHexBytes, 4),
+        nodeHexBytes: pickInt(env.IMA2_NODE_HEX_BYTES, fileCfg.ids?.nodeHexBytes, 5),
+    },
+    inflight: {
+        ttlMs: pickInt(env.IMA2_INFLIGHT_TTL_MS, fileCfg.inflight?.ttlMs, 10 * 60 * 1000),
+        reapMs: pickInt(env.IMA2_INFLIGHT_REAP_MS, fileCfg.inflight?.reapMs, 60 * 1000),
+        terminalTtlMs: pickInt(env.IMA2_INFLIGHT_TERMINAL_TTL_MS, fileCfg.inflight?.terminalTtlMs, 5 * 60 * 1000),
+    },
+    trash: {
+        ttlMs: pickInt(env.IMA2_TRASH_TTL_MS, fileCfg.trash?.ttlMs, 10_000),
+    },
+    styleSheet: {
+        maxPrefix: pickInt(env.IMA2_STYLE_SHEET_MAX_PREFIX, fileCfg.styleSheet?.maxPrefix, 4000),
+        model: pickStr(env.IMA2_STYLE_MODEL, fileCfg.styleSheet?.model, "gpt-5.4-mini"),
+    },
+    imageModels: {
+        default: pickStr(env.IMA2_IMAGE_MODEL_DEFAULT, fileCfg.imageModels?.default, "gpt-5.4-mini"),
+        valid: new Set(["gpt-5.5", "gpt-5.4", "gpt-5.4-mini"]),
+        unsupported: new Set(["gpt-5.3-codex-spark"]),
+        reasoningEffort: pickStr(env.IMA2_REASONING_EFFORT, fileCfg.imageModels?.reasoningEffort, "medium"),
+        validReasoningEfforts: new Set(["none", "low", "medium", "high", "xhigh"]),
+    },
+    apiProvider: {
+        defaultImageModel: pickStr(env.IMA2_API_IMAGE_MODEL_DEFAULT, fileCfg.apiProvider?.defaultImageModel, "gpt-5.4-mini"),
+        defaultReasoningEffort: pickStr(env.IMA2_API_REASONING_EFFORT, fileCfg.apiProvider?.defaultReasoningEffort, "low"),
+        defaultSize: pickStr(env.IMA2_API_IMAGE_SIZE, fileCfg.apiProvider?.defaultSize, "1024x1024"),
+        allowWebSearch: pickBool(env.IMA2_API_ALLOW_WEB_SEARCH, fileCfg.apiProvider?.allowWebSearch, true),
+    },
+    log: {
+        level: pickStr(env.IMA2_LOG_LEVEL, fileCfg.log?.level, defaultLogLevelForEnv(env)),
+        pretty: env.NODE_ENV !== "production",
+    },
+    features: {
+        cardNews: pickBool(env.IMA2_CARD_NEWS, fileCfg.features?.cardNews, env.IMA2_DEV === "1"),
+    },
+    cardNewsPlanner: {
+        enabled: pickBool(env.IMA2_CARD_NEWS_PLANNER, fileCfg.cardNewsPlanner?.enabled, true),
+        model: pickStr(env.IMA2_CARD_NEWS_PLANNER_MODEL, fileCfg.cardNewsPlanner?.model, "gpt-5.4-mini"),
+        timeoutMs: pickInt(env.IMA2_CARD_NEWS_PLANNER_TIMEOUT_MS, fileCfg.cardNewsPlanner?.timeoutMs, 60_000),
+        deterministicFallback: pickBool(env.IMA2_CARD_NEWS_PLANNER_FALLBACK, fileCfg.cardNewsPlanner?.deterministicFallback, false),
+    },
+    comfy: {
+        defaultUrl: pickStr(env.IMA2_COMFY_URL, fileCfg.comfy?.defaultUrl, "http://127.0.0.1:8188"),
+        uploadTimeoutMs: pickPositiveInt(env.IMA2_COMFY_UPLOAD_TIMEOUT_MS, fileCfg.comfy?.uploadTimeoutMs, 30_000),
+        maxUploadBytes: pickPositiveInt(env.IMA2_COMFY_MAX_UPLOAD_BYTES, fileCfg.comfy?.maxUploadBytes, 50 * 1024 * 1024),
+    },
+    dev: {
+        viteDevMode: pickBool(env.VITE_IMA2_DEV, fileCfg.dev?.viteDevMode, false),
+    },
 };
-
 export default config;
-
 // ── Backward-compatible flat re-exports (used by lib/inflight.js & earlier
 //    call sites). Prefer `import { config } from "./config.js"` going forward.
 export const PORT = config.server.port;