From c13205e9a790fc4161d5165b54d3eb7142f11e83 Mon Sep 17 00:00:00 2001 From: Benjamin Lu Date: Sat, 14 Nov 2026 21:04:23 -0800 Subject: [PATCH] fix(types): type settings reads from main's known settings and keep one copy of the snapshot types (DESK-212) `getSetting` returned `Promise`, so callers cast the result. `getSetting` and `setSetting` now take a known setting key and use the type main declares for it in `KnownSettings`. The four casts are gone, and an unknown key or a value of the wrong type no longer compiles. `hasSeenCentralPillHint` was read and written by the title bar but was not a known setting. It is one now, with no telemetry, so nothing about how it is stored changes. `SnapshotDetailData`, `SnapshotDiffData`, `SnapshotDiffSummary` and `SnapshotSummary` were declared in both `src/main/lib/snapshots/types.ts` and `src/types/ipc.ts`. Main now re-exports the ones in `src/types/ipc.ts`, so the snapshot builders are checked against what the renderer is told it gets. --- src/main/lib/snapshots/types.ts | 55 +++---------------- src/main/settings.ts | 2 + .../comfyTitleBar/useCentralPillCoachmark.ts | 4 +- .../src/composables/useLauncherPrefs.ts | 4 +- src/renderer/src/lib/rendererBootstrap.ts | 2 +- src/renderer/src/views/FirstUseTakeover.vue | 4 +- src/types/ipc.ts | 6 +- 7 files changed, 18 insertions(+), 59 deletions(-) diff --git a/src/main/lib/snapshots/types.ts b/src/main/lib/snapshots/types.ts index bc2921f05..2166c6f93 100644 --- a/src/main/lib/snapshots/types.ts +++ b/src/main/lib/snapshots/types.ts @@ -1,6 +1,13 @@ import type { ScannedNode } from '../nodes' import type { SnapshotTorchStack } from '../../sources/standalone/torchStackTypes' +export type { + SnapshotDetailData, + SnapshotDiffData, + SnapshotDiffSummary, + SnapshotSummary +} from '../../../types/ipc' + export type RestoreMode = 'exact' | 'compatible' export interface Snapshot { @@ -70,54 +77,6 @@ export interface SnapshotDiff { pipsChanged: Array<{ name: string; from: string; to: string }> } -export interface SnapshotDiffSummary { - nodesAdded: number - nodesRemoved: number - nodesChanged: number - pipsAdded: number - pipsRemoved: number - pipsChanged: number - comfyuiChanged: boolean - updateChannelChanged: boolean -} - -export interface SnapshotSummary { - filename: string - createdAt: string - trigger: 'boot' | 'restart' | 'manual' | 'pre-update' | 'post-update' | 'post-restore' - label: string | null - comfyuiVersion: string - nodeCount: number - pipPackageCount: number - diffVsPrevious?: SnapshotDiffSummary -} - -export interface SnapshotDetailData { - filename: string - createdAt: string - trigger: string - label: string | null - comfyuiVersion: string - comfyui: { - ref: string - commit: string | null - releaseTag: string - variant: string - } - pythonVersion?: string - updateChannel?: string - customNodes: ScannedNode[] - pipPackageCount: number - pipPackages: Record -} - -export interface SnapshotDiffData { - mode: 'previous' | 'current' - baseLabel: string - diff: SnapshotDiff - empty: boolean -} - export interface RestoreRevertOutcome { reason: 'cancelled' | 'failures' uninstalled: string[] diff --git a/src/main/settings.ts b/src/main/settings.ts index e10a81bfb..ec8558ca8 100644 --- a/src/main/settings.ts +++ b/src/main/settings.ts @@ -43,6 +43,7 @@ export interface KnownSettings { cloudNodesAnnouncementSeen?: boolean comfyRouterAnnouncementSeen?: boolean comfyApiAnnouncementSeen?: boolean + hasSeenCentralPillHint?: boolean betaNoticeAnnouncedArgs?: string[] hideCloudFromPicker?: boolean oemManagedModelDirs?: string[] @@ -167,6 +168,7 @@ const SETTINGS_SCHEMA = { cloudNodesAnnouncementSeen: { nullable: false, telemetry: { policy: 'omit' } }, comfyRouterAnnouncementSeen: { nullable: false, telemetry: { policy: 'omit' } }, comfyApiAnnouncementSeen: { nullable: false, telemetry: { policy: 'omit' } }, + hasSeenCentralPillHint: { nullable: false, telemetry: { policy: 'omit' } }, betaNoticeAnnouncedArgs: { nullable: false, telemetry: { policy: 'omit' } }, hideCloudFromPicker: { nullable: false, diff --git a/src/renderer/src/comfyTitleBar/useCentralPillCoachmark.ts b/src/renderer/src/comfyTitleBar/useCentralPillCoachmark.ts index ba8ac68ff..4c3eea68b 100644 --- a/src/renderer/src/comfyTitleBar/useCentralPillCoachmark.ts +++ b/src/renderer/src/comfyTitleBar/useCentralPillCoachmark.ts @@ -44,9 +44,7 @@ export function useCentralPillCoachmark( async function isSeen(): Promise { if (hasCoachmarkRetired) return true try { - const v = await (window.api.getSetting(CENTRAL_PILL_HINT_SEEN_KEY) as Promise< - boolean | undefined - >) + const v = await window.api.getSetting(CENTRAL_PILL_HINT_SEEN_KEY) return v === true } catch { return false diff --git a/src/renderer/src/composables/useLauncherPrefs.ts b/src/renderer/src/composables/useLauncherPrefs.ts index b6bc84a24..87cd8d2d6 100644 --- a/src/renderer/src/composables/useLauncherPrefs.ts +++ b/src/renderer/src/composables/useLauncherPrefs.ts @@ -15,9 +15,7 @@ export function useLauncherPrefs() { async function loadPrefs(): Promise { if (loadPromise) return loadPromise loadPromise = (async () => { - const firstUse = await (window.api.getSetting('firstUseCompleted') as Promise< - boolean | undefined - >) + const firstUse = await window.api.getSetting('firstUseCompleted') firstUseCompleted.value = firstUse === true loaded.value = true })() diff --git a/src/renderer/src/lib/rendererBootstrap.ts b/src/renderer/src/lib/rendererBootstrap.ts index 4b030bd8b..2da5ec13c 100644 --- a/src/renderer/src/lib/rendererBootstrap.ts +++ b/src/renderer/src/lib/rendererBootstrap.ts @@ -83,7 +83,7 @@ function toDatadogTrackingConsent(enabled: boolean | undefined): DatadogTracking async function getTelemetryEnabledSetting(): Promise { try { - return (await window.api.getSetting('telemetryEnabled')) as boolean | undefined + return await window.api.getSetting('telemetryEnabled') } catch { return undefined } diff --git a/src/renderer/src/views/FirstUseTakeover.vue b/src/renderer/src/views/FirstUseTakeover.vue index 321885a53..eb9ce24cf 100644 --- a/src/renderer/src/views/FirstUseTakeover.vue +++ b/src/renderer/src/views/FirstUseTakeover.vue @@ -318,10 +318,10 @@ async function open(opts: OpenOpts = {}): Promise { restoreConsent(props.consent) return } - const [existing, existingBeta] = (await Promise.all([ + const [existing, existingBeta] = await Promise.all([ window.api.getSetting('telemetryEnabled'), window.api.getSetting('betaFeaturesEnabled') - ])) as [boolean | undefined, boolean | undefined] + ]) if (gen !== openGeneration) return telemetryEnabled.value = existing !== false betaTouched.value = typeof existingBeta === 'boolean' diff --git a/src/types/ipc.ts b/src/types/ipc.ts index 9df2a2fdf..1e5af100a 100644 --- a/src/types/ipc.ts +++ b/src/types/ipc.ts @@ -20,6 +20,8 @@ export type { import type { BetaActivationNotice } from '../main/lib/betaActivationNotice' export type { BetaActivationNotice } +import type { KnownSettingKey, KnownSettings } from '../main/settings' + export interface CoachmarkBeakPayload { beakFraction: number cardCentreInView: number | null @@ -1269,8 +1271,8 @@ export interface ElectronApi { getModelsSections(): Promise getMediaSections(): Promise getUniqueName(baseName: string): Promise - setSetting(key: string, value: unknown): Promise - getSetting(key: string): Promise + setSetting(key: K, value: KnownSettings[K]): Promise + getSetting(key: K): Promise getPendingBetaNotice(installationId: string): Promise acknowledgeBetaNotice(installationId: string, shownArgs?: string[]): Promise